diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 58a1a1be3..133c92276 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -38,8 +38,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml b/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml index 325a55ada..04b181dcb 100644 --- a/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml @@ -230,8 +230,6 @@ spec: value: /certs - name: X_CSI_HEALTH_MONITOR_ENABLED value: false - - name: X_CSI_NFS_ACLS - value: - name: X_CSI_QUOTA_ENABLED value: volumeMounts: diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go index 47a22954a..dce042ee0 100644 --- a/pkg/drivers/powerflex.go +++ b/pkg/drivers/powerflex.go @@ -46,9 +46,6 @@ const ( // CsiVxflexosMaxVolumesPerNode - Max volumes that the controller could schedule on a node CsiVxflexosMaxVolumesPerNode = "" - // CsiVxflexosNfsAcls - Enables setting permissions on NFS mount directory - CsiVxflexosNfsAcls = "" - // CsiVxflexosQuotaEnabled - Flag to enable/disable setting of quota for NFS volumes CsiVxflexosQuotaEnabled = "" ) @@ -230,7 +227,6 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT renameSdcPrefix := "" maxVolumesPerNode := "" storageCapacity := "false" - nfsAcls := "" enableQuota := "" switch fileType { @@ -248,9 +244,6 @@ 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_QUOTA_ENABLED" { enableQuota = env.Value } @@ -264,7 +257,6 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT storageCapacity = "true" } yamlString = strings.ReplaceAll(yamlString, CsiStorageCapacityEnabled, storageCapacity) - yamlString = strings.ReplaceAll(yamlString, CsiVxflexosNfsAcls, nfsAcls) yamlString = strings.ReplaceAll(yamlString, CsiVxflexosQuotaEnabled, enableQuota) } return yamlString diff --git a/samples/storage_csm_powerflex_v280.yaml b/samples/storage_csm_powerflex_v280.yaml index 7963e80a1..3bc4b20c8 100644 --- a/samples/storage_csm_powerflex_v280.yaml +++ b/samples/storage_csm_powerflex_v280.yaml @@ -38,8 +38,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/tests/config/driverconfig/powerflex/v2.8.0/controller.yaml b/tests/config/driverconfig/powerflex/v2.8.0/controller.yaml index 64e9929b2..8f14c682b 100644 --- a/tests/config/driverconfig/powerflex/v2.8.0/controller.yaml +++ b/tests/config/driverconfig/powerflex/v2.8.0/controller.yaml @@ -230,8 +230,6 @@ spec: value: /certs - name: X_CSI_HEALTH_MONITOR_ENABLED value: false - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: false volumeMounts: diff --git a/tests/e2e/testfiles/storage_csm_powerflex.yaml b/tests/e2e/testfiles/storage_csm_powerflex.yaml index de09c1121..bdf30a581 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex.yaml @@ -40,8 +40,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml index 8631f36c8..13f5b8118 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "1" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml index f9aad181c..7fe75db90 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml index 5e2d2df5b..f8ae446a3 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml index cee47277a..0ca4dbade 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml index b834f8488..cec343e8a 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - name: X_CSI_NFS_ACLS - value: "0777" - name: X_CSI_QUOTA_ENABLED value: "false"