From 7f93ef8230f4412ce364839907b4cd8285432a28 Mon Sep 17 00:00:00 2001 From: shaynafinocchiaro <66699024+shaynafinocchiaro@users.noreply.github.com> Date: Fri, 1 Sep 2023 09:49:07 -0400 Subject: [PATCH 1/5] [charts/container-storage-modules]: Uncomment Resiliency arguments (#287) * uncomment resiliency args * fix spacing --- charts/container-storage-modules/values.yaml | 82 ++++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml index a10506c1..87c4fed6 100644 --- 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" @@ -209,29 +209,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 @@ -297,24 +297,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 From aadd34fde729c3149dd08a350eff6a704a9cc632 Mon Sep 17 00:00:00 2001 From: mdutka-dell <115641913+mdutka-dell@users.noreply.github.com> Date: Fri, 1 Sep 2023 16:31:20 +0200 Subject: [PATCH 2/5] correct cosi log level setting (#288) --- charts/cosi/templates/_helpers.tpl | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/charts/cosi/templates/_helpers.tpl b/charts/cosi/templates/_helpers.tpl index 9181052c..27917716 100644 --- 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 }} From 31a38bce4e7cf615fc08f58e8a2ea791c6cf07e7 Mon Sep 17 00:00:00 2001 From: Rajshree Khare <69839943+khareRajshree@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:16:49 +0530 Subject: [PATCH 3/5] [charts/container-storage-modules]: new keys added for PowerFlex driver (#286) * PowerFlex new keys added --- charts/container-storage-modules/values.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml index 87c4fed6..537cf55a 100644 --- a/charts/container-storage-modules/values.yaml +++ b/charts/container-storage-modules/values.yaml @@ -264,6 +264,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 +290,9 @@ csi-vxflexos: # operator: "Exists" # effect: "NoSchedule" storageCapacity: - enabled: true + enabled: true + nfsAcls: "0777" + enableQuota: false monitor: enabled: false vgsnapshotter: From 123d04ce68c8afed310efb7028c5d70a7f1dd98d Mon Sep 17 00:00:00 2001 From: Rajshree Khare <69839943+khareRajshree@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:14:14 +0530 Subject: [PATCH 4/5] NFS ACL parameter removed (#289) --- charts/container-storage-modules/values.yaml | 1 - charts/csi-vxflexos/templates/controller.yaml | 4 ---- charts/csi-vxflexos/values.yaml | 15 --------------- 3 files changed, 20 deletions(-) diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml index 537cf55a..a8212620 100644 --- a/charts/container-storage-modules/values.yaml +++ b/charts/container-storage-modules/values.yaml @@ -291,7 +291,6 @@ csi-vxflexos: # effect: "NoSchedule" storageCapacity: enabled: true - nfsAcls: "0777" enableQuota: false monitor: enabled: false diff --git a/charts/csi-vxflexos/templates/controller.yaml b/charts/csi-vxflexos/templates/controller.yaml index 0b064b32..6cb80cb2 100644 --- 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 index 31cbc9fb..e5ca058c 100644 --- a/charts/csi-vxflexos/values.yaml +++ b/charts/csi-vxflexos/values.yaml @@ -46,21 +46,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 From 9df81a232647551ff0a0717b39763ace0571c0d4 Mon Sep 17 00:00:00 2001 From: boyamurthy <92081029+boyamurthy@users.noreply.github.com> Date: Tue, 5 Sep 2023 11:28:43 +0530 Subject: [PATCH 5/5] Adding new fields for powermax (#290) --- charts/container-storage-modules/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml index a8212620..15fa797b 100644 --- a/charts/container-storage-modules/values.yaml +++ b/charts/container-storage-modules/values.yaml @@ -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 ########################