powerflex: support added for NFS (#318)

dell · Aug 10, 2023 · f28e7df · f28e7df
1 parent 820ac88
commit f28e7df
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 0 deletions.
diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml
@@ -33,6 +33,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
     sideCars:
     # sdc-monitor is disabled by default, due to high CPU usage 

diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml b/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml
@@ -212,6 +212,12 @@ spec:
               value: /certs
             - name: X_CSI_HEALTH_MONITOR_ENABLED
               value: false
+            - name: X_CSI_NFS_ACLS
+              value: <X_CSI_NFS_ACLS>
+            - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+              value: <X_CSI_POWERFLEX_EXTERNAL_ACCESS>
+            - name: X_CSI_QUOTA_ENABLED
+              value: <X_CSI_QUOTA_ENABLED>
           volumeMounts:
             - name: socket-dir
               mountPath: /var/run/csi

diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go
@@ -45,6 +45,15 @@ const (
 
 	// CsiVxflexosMaxVolumesPerNode - Max volumes that the controller could schedule on a node
 	CsiVxflexosMaxVolumesPerNode = "<X_CSI_MAX_VOLUMES_PER_NODE>"
+
+	// CsiVxflexosNfsAcls - Enables setting permissions on NFS mount directory
+	CsiVxflexosNfsAcls = "<X_CSI_NFS_ACLS>"
+
+	// CsiVxflexosExternaAccess - Specify additional entries for host to access NFS volumes
+	CsiVxflexosExternaAccess = "<X_CSI_POWERFLEX_EXTERNAL_ACCESS>"
+
+	// CsiVxflexosQuotaEnabled - Flag to enable/disable setting of quota for NFS volumes
+	CsiVxflexosQuotaEnabled = "<X_CSI_QUOTA_ENABLED>"
 )
 
 // PrecheckPowerFlex do input validation
@@ -223,6 +232,9 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT
 	renameSdcEnabled := ""
 	renameSdcPrefix := ""
 	maxVolumesPerNode := ""
+	nfsAcls := ""
+	externalAscess := ""
+	enableQuota := ""
 
 	switch fileType {
 	case "Node":
@@ -239,11 +251,23 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT
 			if env.Name == "X_CSI_MAX_VOLUMES_PER_NODE" {
 				maxVolumesPerNode = env.Value
 			}
+			if env.Name == "X_CSI_NFS_ACLS" {
+				nfsAcls = env.Value
+			}
+			if env.Name == "X_CSI_POWERFLEX_EXTERNAL_ACCESS" {
+				externalAscess = env.Value
+			}
+			if env.Name == "X_CSI_QUOTA_ENABLED" {
+				enableQuota = env.Value
+			}
 		}
 		yamlString = strings.ReplaceAll(yamlString, CsiApproveSdcEnabled, approveSdcEnabled)
 		yamlString = strings.ReplaceAll(yamlString, CsiRenameSdcEnabled, renameSdcEnabled)
 		yamlString = strings.ReplaceAll(yamlString, CsiPrefixRenameSdc, renameSdcPrefix)
 		yamlString = strings.ReplaceAll(yamlString, CsiVxflexosMaxVolumesPerNode, maxVolumesPerNode)
+		yamlString = strings.ReplaceAll(yamlString, CsiVxflexosNfsAcls, nfsAcls)
+		yamlString = strings.ReplaceAll(yamlString, CsiVxflexosExternaAccess, externalAscess)
+		yamlString = strings.ReplaceAll(yamlString, CsiVxflexosQuotaEnabled, enableQuota)
 
 	}
 	return yamlString

diff --git a/samples/storage_csm_powerflex_v280.yaml b/samples/storage_csm_powerflex_v280.yaml
@@ -33,6 +33,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
     sideCars:
     # sdc-monitor is disabled by default, due to high CPU usage 

diff --git a/tests/config/driverconfig/powerflex/v2.8.0/controller.yaml b/tests/config/driverconfig/powerflex/v2.8.0/controller.yaml
@@ -212,6 +212,12 @@ spec:
               value: /certs
             - name: X_CSI_HEALTH_MONITOR_ENABLED
               value: false
+            - name: X_CSI_NFS_ACLS
+              value: "0777"
+            - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+              value: ""
+            - name: X_CSI_QUOTA_ENABLED
+              value: false
           volumeMounts:
             - name: socket-dir
               mountPath: /var/run/csi

diff --git a/tests/e2e/testfiles/storage_csm_powerflex.yaml b/tests/e2e/testfiles/storage_csm_powerflex.yaml
@@ -35,6 +35,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
 
     sideCars:

diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml
@@ -35,6 +35,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "1"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
 
     sideCars:

diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml
@@ -35,6 +35,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
 
     sideCars:

diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml
@@ -35,6 +35,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
 
     sideCars:

diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml
@@ -35,6 +35,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
 
     sideCars:

diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml
@@ -35,6 +35,12 @@ spec:
           value: "/var/lib/kubelet"
         - name: "CERT_SECRET_COUNT"
           value: "0"
+        - name: X_CSI_NFS_ACLS
+          value: "0777"
+        - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS
+          value: ""
+        - name: X_CSI_QUOTA_ENABLED
+          value: "false"
 
 
     sideCars: