Merge pull request #758 from zhucan/bugfix-499

feat: Support secret in NodeExpansion Call

Author: k8s-ci-robot

pkg/controller/controller.go

@@ -95,6 +95,9 @@ const (
 	prefixedControllerExpandSecretNameKey      = csiParameterPrefix + "controller-expand-secret-name"
 	prefixedControllerExpandSecretNamespaceKey = csiParameterPrefix + "controller-expand-secret-namespace"
 
+	prefixedNodeExpandSecretNameKey      = csiParameterPrefix + "node-expand-secret-name"
+	prefixedNodeExpandSecretNamespaceKey = csiParameterPrefix + "node-expand-secret-namespace"
+
 	// [Deprecated] CSI Parameters that are put into fields but
 	// NOT stripped from the parameters passed to CreateVolume
 	provisionerSecretNameKey      = "csiProvisionerSecretName"
@@ -188,6 +191,12 @@ var (
 		secretNameKey:      prefixedControllerExpandSecretNameKey,
 		secretNamespaceKey: prefixedControllerExpandSecretNamespaceKey,
 	}
+
+	nodeExpandSecretParams = secretParamsMap{
+		name:               "NodeExpand",
+		secretNameKey:      prefixedNodeExpandSecretNameKey,
+		secretNamespaceKey: prefixedNodeExpandSecretNamespaceKey,
+	}
 )
 
 // ProvisionerCSITranslator contains the set of CSI Translation functionality
@@ -687,13 +696,18 @@ func (p *csiProvisioner) prepareProvision(ctx context.Context, claim *v1.Persist
 	if err != nil {
 		return nil, controller.ProvisioningNoChange, err
 	}
+	nodeExpandSecretRef, err := getSecretReference(nodeExpandSecretParams, sc.Parameters, pvName, claim)
+	if err != nil {
+		return nil, controller.ProvisioningNoChange, err
+	}
 	csiPVSource := &v1.CSIPersistentVolumeSource{
 		Driver: p.driverName,
 		// VolumeHandle and VolumeAttributes will be added after provisioning.
 		ControllerPublishSecretRef: controllerPublishSecretRef,
 		NodeStageSecretRef:         nodeStageSecretRef,
 		NodePublishSecretRef:       nodePublishSecretRef,
 		ControllerExpandSecretRef:  controllerExpandSecretRef,
+		NodeExpandSecretRef:        nodeExpandSecretRef,
 	}
 
 	req.Parameters, err = removePrefixedParameters(sc.Parameters)
@@ -947,6 +961,8 @@ func removePrefixedParameters(param map[string]string) (map[string]string, error
 			case prefixedControllerExpandSecretNamespaceKey:
 			case prefixedDefaultSecretNameKey:
 			case prefixedDefaultSecretNamespaceKey:
+			case prefixedNodeExpandSecretNameKey:
+			case prefixedNodeExpandSecretNamespaceKey:
 			default:
 				return map[string]string{}, fmt.Errorf("found unknown parameter key \"%s\" with reserved namespace %s", k, csiParameterPrefix)
 			}

pkg/controller/controller_test.go

@@ -226,6 +226,8 @@ func TestStripPrefixedCSIParams(t *testing.T) {
 				prefixedControllerExpandSecretNamespaceKey:  "csiBar",
 				prefixedDefaultSecretNameKey:                "csiBar",
 				prefixedDefaultSecretNamespaceKey:           "csiBar",
+				prefixedNodeExpandSecretNameKey:             "csiBar",
+				prefixedNodeExpandSecretNamespaceKey:        "csiBar",
 			},
 			expectedParams: map[string]string{},
 		},
@@ -876,6 +878,8 @@ func getDefaultStorageClassSecretParameters() map[string]string {
 		prefixedControllerExpandSecretNamespaceKey: defaultSecretNsName,
 		prefixedProvisionerSecretNameKey:           "provisionersecret",
 		prefixedProvisionerSecretNamespaceKey:      defaultSecretNsName,
+		prefixedNodeExpandSecretNameKey:            "nodeexpandsecret",
+		prefixedNodeExpandSecretNamespaceKey:       defaultSecretNsName,
 	}
 }
 
@@ -906,6 +910,11 @@ func getDefaultSecretObjects() []runtime.Object {
 				Name:      "provisionersecret",
 				Namespace: defaultSecretNsName,
 			},
+		}, &v1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "nodeexpandsecret",
+				Namespace: defaultSecretNsName,
+			},
 		},
 	}
 }
@@ -1597,6 +1606,10 @@ func provisionTestcases() (int64, map[string]provisioningTestcase) {
 						Name:      "controllerexpandsecret",
 						Namespace: "default",
 					},
+					NodeExpandSecretRef: &v1.SecretReference{
+						Name:      "nodeexpandsecret",
+						Namespace: "default",
+					},
 				},
 			},
 			expectState: controller.ProvisioningFinished,
@@ -1652,6 +1665,10 @@ func provisionTestcases() (int64, map[string]provisioningTestcase) {
 						Name:      "default-secret",
 						Namespace: "default-ns",
 					},
+					NodeExpandSecretRef: &v1.SecretReference{
+						Name:      "default-secret",
+						Namespace: "default-ns",
+					},
 				},
 			},
 			expectState: controller.ProvisioningFinished,
@@ -1707,6 +1724,10 @@ func provisionTestcases() (int64, map[string]provisioningTestcase) {
 						Name:      "my-pvc",
 						Namespace: "default-ns",
 					},
+					NodeExpandSecretRef: &v1.SecretReference{
+						Name:      "my-pvc",
+						Namespace: "default-ns",
+					},
 				},
 			},
 			expectState: controller.ProvisioningFinished,