Skip to content

Commit

Permalink
removed the nfsAcls for csi-powerflex. (#351)
Browse files Browse the repository at this point in the history
  • Loading branch information
VamsiSiddu-7 authored Sep 5, 2023
1 parent a14caa8 commit c70a24e
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 28 deletions.
2 changes: 0 additions & 2 deletions config/samples/storage_v1_csm_powerflex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ spec:
value: /certs
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: false
- name: X_CSI_NFS_ACLS
value: <X_CSI_NFS_ACLS>
- name: X_CSI_QUOTA_ENABLED
value: <X_CSI_QUOTA_ENABLED>
volumeMounts:
Expand Down
8 changes: 0 additions & 8 deletions pkg/drivers/powerflex.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ 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>"

// CsiVxflexosQuotaEnabled - Flag to enable/disable setting of quota for NFS volumes
CsiVxflexosQuotaEnabled = "<X_CSI_QUOTA_ENABLED>"
)
Expand Down Expand Up @@ -230,7 +227,6 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT
renameSdcPrefix := ""
maxVolumesPerNode := ""
storageCapacity := "false"
nfsAcls := ""
enableQuota := ""

switch fileType {
Expand All @@ -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
}
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions samples/storage_csm_powerflex_v280.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions tests/config/driverconfig/powerflex/v2.8.0/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerflex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions tests/e2e/testfiles/storage_csm_powerflex_alt_vals_5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit c70a24e

Please sign in to comment.