Merge branch 'release-v1.8.0' into pflex-driver-images

dell · Sep 6, 2023 · a738ff4 · a738ff4
2 parents bf57de9 + 9df81a2
commit a738ff4
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 67 deletions.
diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml
@@ -45,7 +45,7 @@ csi-powerstore:
     healthMonitor:
       enabled: false
     nodeSelector:
-      # Uncomment if CSM for Resiliency and CSI Driver pods monitor are enabled
+    # Uncomment if CSM for Resiliency and CSI Driver pods monitor are enabled
     # tolerations:
     # - key: "offline.vxflexos.storage.dell.com"
     #   operator: "Exists"
@@ -157,6 +157,10 @@ csi-powermax:
     fcHostName: "csi-vsphere-VC-HN"
     vCenterHost: "00.000.000.00"
     vCenterCredSecret: vcenter-creds
+  storageCapacity:
+    enabled: true
+  maxPowerMaxVolumesPerNode: 0
+
 
 ## CSI PowerScale
 ########################
@@ -209,29 +213,29 @@ csi-isilon:
   podmon:
     enabled: false
     image: dellemc/podmon:v1.7.0
-    #controller:
-    #  args:
-    #    - "--csisock=unix:/var/run/csi/csi.sock"
-    #    - "--labelvalue=csi-isilon"
-    #    - "--arrayConnectivityPollRate=60"
-    #    - "--driverPath=csi-isilon.dellemc.com"
-    #    - "--mode=controller"
-    #    - "--skipArrayConnectionValidation=false"
-    #    - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
-    #    - "--driverPodLabelValue=dell-storage"
-    #    - "--ignoreVolumelessPods=false"
+    controller:
+      args:
+        - "--csisock=unix:/var/run/csi/csi.sock"
+        - "--labelvalue=csi-isilon"
+        - "--arrayConnectivityPollRate=60"
+        - "--driverPath=csi-isilon.dellemc.com"
+        - "--mode=controller"
+        - "--skipArrayConnectionValidation=false"
+        - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
+        - "--driverPodLabelValue=dell-storage"
+        - "--ignoreVolumelessPods=false"
 
-    #node:
-    #  args:
-    #    - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
-    #    - "--labelvalue=csi-isilon"
-    #    - "--arrayConnectivityPollRate=60"
-    #    - "--driverPath=csi-isilon.dellemc.com"
-    #    - "--mode=node"
-    #    - "--leaderelection=false"
-    #    - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
-    #    - "--driverPodLabelValue=dell-storage"
-    #    - "--ignoreVolumelessPods=false"
+    node:
+      args:
+        - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
+        - "--labelvalue=csi-isilon"
+        - "--arrayConnectivityPollRate=60"
+        - "--driverPath=csi-isilon.dellemc.com"
+        - "--mode=node"
+        - "--leaderelection=false"
+        - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
+        - "--driverPodLabelValue=dell-storage"
+        - "--ignoreVolumelessPods=false"
   authorization:
     enabled: false
     sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0
@@ -264,6 +268,11 @@ csi-vxflexos:
     healthMonitor:
       enabled: false
     nodeSelector:
+    renameSDC:
+      enabled: false
+      sdcPrefix:
+    approveSDC:
+      enabled: false
     tolerations:
     # Uncomment if CSM for Resiliency and CSI Driver pods monitor is enabled 
     # - key: "offline.vxflexos.storage.dell.com"
@@ -285,7 +294,8 @@ csi-vxflexos:
     #   operator: "Exists"
     #   effect: "NoSchedule"
   storageCapacity:
-    enabled: true  
+    enabled: true
+  enableQuota: false
   monitor:
     enabled: false
   vgsnapshotter:
@@ -297,24 +307,24 @@ csi-vxflexos:
   podmon:
     enabled: false
     image: dellemc/podmon:v1.7.0
-    # controller:
-    #  args:
-    #    - "--csisock=unix:/var/run/csi/csi.sock"
-    #    - "--labelvalue=csi-vxflexos"
-    #    - "--mode=controller"
-    #    - "--skipArrayConnectionValidation=false"
-    #    - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
-    #    - "--driverPodLabelValue=dell-storage"
-    #    - "--ignoreVolumelessPods=false"
-    # node:
-    #   args:
-    #     - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock"
-    #     - "--labelvalue=csi-vxflexos"
-    #     - "--mode=node"
-    #     - "--leaderelection=false"
-    #     - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
-    #     - "--driverPodLabelValue=dell-storage"
-    #     - "--ignoreVolumelessPods=false"
+    controller:
+      args:
+        - "--csisock=unix:/var/run/csi/csi.sock"
+        - "--labelvalue=csi-vxflexos"
+        - "--mode=controller"
+        - "--skipArrayConnectionValidation=false"
+        - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
+        - "--driverPodLabelValue=dell-storage"
+        - "--ignoreVolumelessPods=false"
+    node:
+      args:
+        - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock"
+        - "--labelvalue=csi-vxflexos"
+        - "--mode=node"
+        - "--leaderelection=false"
+        - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
+        - "--driverPodLabelValue=dell-storage"
+        - "--ignoreVolumelessPods=false"
   authorization:
     enabled: false
     sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0

diff --git a/charts/cosi/templates/_helpers.tpl b/charts/cosi/templates/_helpers.tpl
@@ -32,13 +32,17 @@ Create chart name and version as used by the chart label.
 
 {{/*
 # COSI driver log level
+# Values are set to the integer value, higher value means more verbose logging
 # Possible values: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 # Default value: 4
 */}}
 {{- define "cosi.logLevel" }}
-  {{- $logLevelValues := list 0 1 2 3 4 5 6 7 8 9 10 }}
-  {{- if (has .Values.provisioner.logLevel $logLevelValues) }}
-    {{- .Values.provisioner.logLevel }}
+  {{- if (kindIs "int64" .Values.provisioner.logLevel) }}
+    {{- if (or (ge .Values.provisioner.logLevel 0) (le .Values.provisioner.logLevel 10)) }}
+      {{- .Values.provisioner.logLevel }}
+    {{- else }}
+      {{- 4 }}
+    {{- end }}
   {{- else }}
     {{- 4 }}
   {{- end }}
@@ -47,12 +51,18 @@ Create chart name and version as used by the chart label.
 {{/*
 # COSI driver sidecar log level
 # Values are set to the integer value, higher value means more verbose logging
+# Possible values: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+# Default value: 4
 */}}
 {{- define "cosi.provisionerSidecarVerbosity" }}
-  {{- if (kindIs "int" .Values.sidecar.verbosity) }}
-    {{- .Values.sidecar.verbosity }}
+  {{- if (kindIs "int64" .Values.sidecar.verbosity) }}
+    {{- if (or (ge .Values.sidecar.verbosity 0) (le .Values.sidecar.verbosity 10)) }}
+      {{- .Values.sidecar.verbosity }}
+    {{- else }}
+      {{- 4 }}
+    {{- end }}
   {{- else }}
-    {{- 5 }}
+    {{- 4 }}
   {{- end }}
 {{- end }}
 

diff --git a/charts/csi-vxflexos/templates/controller.yaml b/charts/csi-vxflexos/templates/controller.yaml
@@ -420,10 +420,6 @@ spec:
               value: "{{ .Values.controller.healthMonitor.enabled }}"
             {{- end }}
             {{- end }}
-            {{- if hasKey .Values "nfsAcls" }}
-            - name: X_CSI_NFS_ACLS
-              value: "{{ .Values.nfsAcls }}"
-            {{- end }}
             {{- if hasKey .Values "enableQuota" }}
             {{- if eq .Values.enableQuota true}}
             - name: X_CSI_QUOTA_ENABLED

diff --git a/charts/csi-vxflexos/values.yaml b/charts/csi-vxflexos/values.yaml
@@ -60,21 +60,6 @@ defaultFsType: ext4
 # Default value: None
 imagePullPolicy: IfNotPresent
 
-# nfsAcls: enables setting permissions on NFS mount directory
-# This value acts as default value for NFS ACL (nfsAcls), if not specified for an array config in secret
-# Permissions can be specified in two formats:
-#   1) Unix mode (NFSv3)
-#   2) NFSv4 ACLs (NFSv4)
-#      NFSv4 ACLs are supported on NFSv4 share only.
-# Allowed values:
-#   1) Unix mode: valid octal mode number
-#      Examples: "0777", "777", "0755"
-#   2) NFSv4 acls: valid NFSv4 acls, separated by comma
-#      Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
-# Optional: true
-# Default value: "0777"
-nfsAcls: "0777"
-
 # enableQuota: a boolean that, when enabled, will set quota limit for a newly provisioned NFS volume.
 # Allowed values:
 #   true: set quota for volume