From 8647018da4222924133f8e57dc605b667c6beb28 Mon Sep 17 00:00:00 2001 From: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:59:09 +0530 Subject: [PATCH 01/86] Remove mode: StandAlone from powermax reverseproxy config.yaml (#562) * remove mode from pmax config.yaml * remove mode from pmax config.yaml --- charts/csi-powermax/charts/csireverseproxy/conf/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml b/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml index 51ed5390..e4355f9f 100644 --- a/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml @@ -1,8 +1,7 @@ -mode: "StandAlone" port: {{ .Values.port }} logLevel: {{ .Values.global.logLevel | default "debug" }} logFormat: {{ .Values.global.logFormat | default "TEXT" }} -standAloneConfig: +config: {{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret }} storageArrays: {{- $_ := first .Values.global.storageArrays }} From 0eaee3160bb5dc551a21a630b64b18ec47e7e8ad Mon Sep 17 00:00:00 2001 From: Nitesh-Rewatkar <90749010+nitesh3108@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:31:25 +0530 Subject: [PATCH 02/86] powermax endpoint update (#570) --- charts/csi-powermax/templates/powermax-array-config.yaml | 5 ++++- charts/csi-powermax/values.yaml | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/csi-powermax/templates/powermax-array-config.yaml b/charts/csi-powermax/templates/powermax-array-config.yaml index 6c23b268..28f58939 100644 --- a/charts/csi-powermax/templates/powermax-array-config.yaml +++ b/charts/csi-powermax/templates/powermax-array-config.yaml @@ -7,5 +7,8 @@ data: powermax-array-config.yaml: | X_CSI_POWERMAX_PORTGROUPS: {{ .Values.global.portGroups | toYaml | default "" }} X_CSI_TRANSPORT_PROTOCOL: {{ .Values.global.transportProtocol | toYaml | default "" }} - X_CSI_POWERMAX_ENDPOINT: {{ .Values.global.endpoint | toYaml | default "" }} + {{- $_ := first .Values.global.storageArrays }} + {{- range $index, $value := .Values.global.storageArrays }} + X_CSI_POWERMAX_ENDPOINT: {{ $value.endpoint | toYaml | default "" }} + {{- end }} X_CSI_MANAGED_ARRAYS: {{ .Values.global.managedArrays | toYaml | default "" }} diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 4d7a1e93..21ec463c 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -19,11 +19,6 @@ global: # Default value: None # Examples: "000000000001", "000000000002" managedArrays: "000000000001,000000000002" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - endpoint: # defaultCredentialsSecret defaultCredentialsSecret: powermax-creds # portGroups: Define the set of existing port groups that the driver will use. From 589e791c9ab37fb9baf4a4e7882f0c9c7503ab8a Mon Sep 17 00:00:00 2001 From: abhi16394 Date: Mon, 9 Dec 2024 13:59:04 -0500 Subject: [PATCH 03/86] Mounting secrets as volumes --- charts/csi-powermax/templates/controller.yaml | 7 +++++++ charts/csi-powermax/templates/node.yaml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index d8b77471..3a28919a 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -428,6 +428,8 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml + - name: X_CSI_POWERMAX_CONFIG_PATH + value: /powermax-config/config - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} - name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION @@ -507,6 +509,8 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config + - name: powermax-config + mountPath: /powermax-config {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - name: reverseproxy image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} @@ -552,6 +556,9 @@ spec: - name: powermax-config-params configMap: name: {{ .Release.Name }}-config-params + - name: powermax-config + secret: + secretName: {{ .Release.Name }}-config {{- if hasKey .Values "authorization" }} {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-config diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index fb5d683c..e9b9a52e 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -203,6 +203,8 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml + - name: X_CSI_POWERMAX_CONFIG_PATH + value: /powermax-config/config - name: X_CSI_POWERMAX_TOPOLOGY_CONFIG_PATH value: /node-topology-config/topologyConfig.yaml - name: X_CSI_IG_NODENAME_TEMPLATE @@ -282,6 +284,8 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config + - name: powermax-config + mountPath: /powermax-config {{- if hasKey .Values.node "topologyControl" }} {{- if eq .Values.node.topologyControl.enabled true }} - name: node-topology-config @@ -478,6 +482,9 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config + - name: powermax-config + secret: + secretName: {{ .Release.Name }}-config - name: certs secret: secretName: {{ .Release.Name }}-certs From 41f32764c5e3d8044b5573e2daa1183b55e81d05 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:23:42 -0800 Subject: [PATCH 04/86] update environment variable name --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 3a28919a..8940dd40 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -428,7 +428,7 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - - name: X_CSI_POWERMAX_CONFIG_PATH + - name: X_CSI_POWERMAX_CONFIG_PROXY_PATH value: /powermax-config/config - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} From 62099f6c92c382667b72b8963471fe5c1663ab90 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:24:47 -0800 Subject: [PATCH 05/86] update environment variable name --- charts/csi-powermax/templates/node.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index e9b9a52e..d00f3327 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -203,7 +203,7 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - - name: X_CSI_POWERMAX_CONFIG_PATH + - name: X_CSI_POWERMAX_CONFIG_PROXY_PATH value: /powermax-config/config - name: X_CSI_POWERMAX_TOPOLOGY_CONFIG_PATH value: /node-topology-config/topologyConfig.yaml From d4586b17df8c19d991129f952e8ea50fe1444bad Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:24:23 -0800 Subject: [PATCH 06/86] Mount volumes to reverseproxy container --- charts/csi-powermax/templates/controller.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 8940dd40..54afdc5d 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -428,8 +428,6 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - - name: X_CSI_POWERMAX_CONFIG_PROXY_PATH - value: /powermax-config/config - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} - name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION @@ -509,8 +507,6 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config - - name: powermax-config - mountPath: /powermax-config {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - name: reverseproxy image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} @@ -520,6 +516,10 @@ spec: value: /etc/config/configmap - name: X_CSI_REVPROXY_CONFIG_FILE_NAME value: config.yaml + - name: X_CSI_REVPROXY_SECRET_DIR + value: /etc/secret/ + - name: X_CSI_REVPROXY_SECRET_NAME + value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR @@ -529,6 +529,8 @@ spec: volumeMounts: - name: configmap-volume mountPath: /etc/config/configmap + - name: reverseproxy-secret + mountPath: /etc/secret - name: tls-secret mountPath: /app/tls - name: cert-dir @@ -548,6 +550,9 @@ spec: - name: tls-secret secret: secretName: {{ .Values.csireverseproxy.tlsSecret }} + - name: reverseproxy-secret + secret: + secretName: {{ .Release.Name }}-reverseproxy-secret - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config @@ -556,9 +561,6 @@ spec: - name: powermax-config-params configMap: name: {{ .Release.Name }}-config-params - - name: powermax-config - secret: - secretName: {{ .Release.Name }}-config {{- if hasKey .Values "authorization" }} {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-config From a20b0e285d2926de97795259a66435810488e27a Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:35:56 -0800 Subject: [PATCH 07/86] Add reverseproxy secret volume --- charts/csi-powermax/templates/node.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index d00f3327..14995bba 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -203,8 +203,6 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - - name: X_CSI_POWERMAX_CONFIG_PROXY_PATH - value: /powermax-config/config - name: X_CSI_POWERMAX_TOPOLOGY_CONFIG_PATH value: /node-topology-config/topologyConfig.yaml - name: X_CSI_IG_NODENAME_TEMPLATE @@ -283,9 +281,7 @@ spec: - name: powermax-config-params mountPath: /powermax-config-params - name: powermax-array-config - mountPath: /powermax-array-config - - name: powermax-config - mountPath: /powermax-config + mountPath: /powermax-array-config {{- if hasKey .Values.node "topologyControl" }} {{- if eq .Values.node.topologyControl.enabled true }} - name: node-topology-config @@ -482,9 +478,9 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - - name: powermax-config + - name: reverseproxy-secret secret: - secretName: {{ .Release.Name }}-config + secretName: {{ .Release.Name }}-reverseproxy-secret - name: certs secret: secretName: {{ .Release.Name }}-certs From 43bc853401a25a92f6730ac8c1caaa922c47eac4 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:46:41 -0800 Subject: [PATCH 08/86] Update reverseproxy environment name --- charts/csi-powermax/templates/controller.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 54afdc5d..8fafb4c3 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -516,8 +516,8 @@ spec: value: /etc/config/configmap - name: X_CSI_REVPROXY_CONFIG_FILE_NAME value: config.yaml - - name: X_CSI_REVPROXY_SECRET_DIR - value: /etc/secret/ + - name: X_CSI_REVPROXY_CONFIG_PATH + value: /powermax-reverseproxy-config/config - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER @@ -529,8 +529,8 @@ spec: volumeMounts: - name: configmap-volume mountPath: /etc/config/configmap - - name: reverseproxy-secret - mountPath: /etc/secret + - name: powermax-reverseproxy-config + mountPath: /powermax-reverseproxy-config - name: tls-secret mountPath: /app/tls - name: cert-dir @@ -550,9 +550,9 @@ spec: - name: tls-secret secret: secretName: {{ .Values.csireverseproxy.tlsSecret }} - - name: reverseproxy-secret + - name: powermax-reverseproxy-config secret: - secretName: {{ .Release.Name }}-reverseproxy-secret + secretName: {{ .Release.Name }}-reverseproxy-config - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config From 411f78a4800e745716e5cdc40da4724e336e9fcf Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:04:41 -0800 Subject: [PATCH 09/86] Mount secret as volumes --- .../csireverseproxy/templates/reverseproxy.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 53d291ca..5fd3b772 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -24,6 +24,10 @@ spec: value: /etc/config/configmap - name: X_CSI_REVPROXY_CONFIG_FILE_NAME value: config.yaml + - name: X_CSI_REVPROXY_CONFIG_PATH + value: /powermax-reverseproxy-config/config + - name: X_CSI_REVPROXY_SECRET_NAME + value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR @@ -37,14 +41,19 @@ spec: mountPath: /app/tls - name: cert-dir mountPath: /app/certs + - name: powermax-reverseproxy-config + mountPath: /powermax-reverseproxy-config volumes: - name: configmap-volume configMap: name: {{ .Release.Name }}-reverseproxy-config optional: true + - name: powermax-reverseproxy-config + secret: + secretName: {{ .Release.Name }}-reverseproxy-config - name: tls-secret secret: secretName: {{ .Values.tlsSecret }} - name: cert-dir emptyDir: -{{- end }} \ No newline at end of file +{{- end }} From 665ce3d3dddb61c98eae92716080515863f71bf1 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:15:58 -0800 Subject: [PATCH 10/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 8fafb4c3..5676360f 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -516,7 +516,7 @@ spec: value: /etc/config/configmap - name: X_CSI_REVPROXY_CONFIG_FILE_NAME value: config.yaml - - name: X_CSI_REVPROXY_CONFIG_PATH + - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-config/config - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml From 250113d27ebe4fb1cc789077811d2f6d334afdee Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:16:20 -0800 Subject: [PATCH 11/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 5fd3b772..72dd9e8e 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -24,7 +24,7 @@ spec: value: /etc/config/configmap - name: X_CSI_REVPROXY_CONFIG_FILE_NAME value: config.yaml - - name: X_CSI_REVPROXY_CONFIG_PATH + - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-config/config - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml From f31cb1b7ed61d819eef3dd9efe25c0f9f84e73dc Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:28:27 -0800 Subject: [PATCH 12/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 14995bba..2eebf0dd 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -478,9 +478,9 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - - name: reverseproxy-secret + - name: powermax-reverseproxy-config secret: - secretName: {{ .Release.Name }}-reverseproxy-secret + secretName: {{ .Release.Name }}-reverseproxy-config - name: certs secret: secretName: {{ .Release.Name }}-certs From 6a61840b007d658ec5045750a6a05ad2ca1ca8a5 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 10:41:54 -0800 Subject: [PATCH 13/86] remove old configmap --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 72dd9e8e..42646b8f 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,10 +20,6 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - - name: X_CSI_REVPROXY_CONFIG_DIR - value: /etc/config/configmap - - name: X_CSI_REVPROXY_CONFIG_FILE_NAME - value: config.yaml - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-config/config - name: X_CSI_REVPROXY_SECRET_NAME @@ -44,10 +40,6 @@ spec: - name: powermax-reverseproxy-config mountPath: /powermax-reverseproxy-config volumes: - - name: configmap-volume - configMap: - name: {{ .Release.Name }}-reverseproxy-config - optional: true - name: powermax-reverseproxy-config secret: secretName: {{ .Release.Name }}-reverseproxy-config From b349977ac25a3f6db011ae9ab435e081388907f5 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 10:42:46 -0800 Subject: [PATCH 14/86] remove configmap --- .../charts/csireverseproxy/templates/configmap.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 27938ea4..8b137891 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -1,7 +1 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-reverseproxy-config - namespace: {{ .Release.Namespace }} -data: -{{ tpl (.Files.Glob "conf/config.yaml").AsConfig . | indent 2 }} + From 734bd55f4a7c3d026d66e9eb185fc4cd3d3d6544 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:22:21 -0800 Subject: [PATCH 15/86] remove older reverseproxy configmaps --- charts/csi-powermax/templates/controller.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 5676360f..62281109 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -512,10 +512,6 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - - name: X_CSI_REVPROXY_CONFIG_DIR - value: /etc/config/configmap - - name: X_CSI_REVPROXY_CONFIG_FILE_NAME - value: config.yaml - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-config/config - name: X_CSI_REVPROXY_SECRET_NAME @@ -527,8 +523,6 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - - name: configmap-volume - mountPath: /etc/config/configmap - name: powermax-reverseproxy-config mountPath: /powermax-reverseproxy-config - name: tls-secret @@ -543,10 +537,6 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true - - name: configmap-volume - configMap: - name: {{ .Release.Name }}-reverseproxy-config - optional: true - name: tls-secret secret: secretName: {{ .Values.csireverseproxy.tlsSecret }} From f255790ebb66f8eef3414eaf0fcd9c25a96d493e Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:25:43 -0800 Subject: [PATCH 16/86] remove configmap volume --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 42646b8f..ab19f2b7 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -31,8 +31,6 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - - name: configmap-volume - mountPath: /etc/config/configmap - name: tls-secret mountPath: /app/tls - name: cert-dir From 21b57631f547566ee29388014b5aadc3a466f0d5 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:37:56 -0800 Subject: [PATCH 17/86] remove secret variable --- charts/csi-powermax/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 21ec463c..75af03c6 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -19,8 +19,6 @@ global: # Default value: None # Examples: "000000000001", "000000000002" managedArrays: "000000000001,000000000002" - # defaultCredentialsSecret - defaultCredentialsSecret: powermax-creds # portGroups: Define the set of existing port groups that the driver will use. # It is a comma separated list of portgroup names. # Required only in case of iSCSI port groups From f6797747b4f4adf78f7088607ca726fdd84bbd2a Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:43:24 -0800 Subject: [PATCH 18/86] remove secret references --- charts/csi-powermax/templates/controller.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 62281109..009c877d 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,16 +414,6 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} - key: password - name: X_CSI_POWERMAX_CONFIG_PATH value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH From bfd2d930afaead75e36b05885f8da6b45efaa202 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:32:21 -0800 Subject: [PATCH 19/86] remove username and password --- charts/csi-powermax/templates/node.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 2eebf0dd..c39d9af0 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -162,16 +162,6 @@ spec: value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} - key: password - name: X_CSI_POWERMAX_NODENAME valueFrom: fieldRef: From 86667ec6d8f221e59f6e2315c3631b223d516791 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:44:55 -0800 Subject: [PATCH 20/86] Update secret path --- charts/csi-powermax/templates/controller.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 009c877d..4e73efcb 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -503,7 +503,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-config/config + value: /powermax-reverseproxy-secret/powermax-reverseproxy-secret.yaml - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER @@ -513,8 +513,8 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - - name: powermax-reverseproxy-config - mountPath: /powermax-reverseproxy-config + - name: powermax-reverseproxy-secret + mountPath: /powermax-reverseproxy-secret - name: tls-secret mountPath: /app/tls - name: cert-dir @@ -530,9 +530,9 @@ spec: - name: tls-secret secret: secretName: {{ .Values.csireverseproxy.tlsSecret }} - - name: powermax-reverseproxy-config + - name: powermax-reverseproxy-secret secret: - secretName: {{ .Release.Name }}-reverseproxy-config + secretName: {{ .Release.Name }}-reverseproxy-secret - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config From bd58bebba3b320fe1e885a36e866131fa4fdb982 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:46:17 -0800 Subject: [PATCH 21/86] Update secret path --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index ab19f2b7..7828e545 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -21,7 +21,7 @@ spec: imagePullPolicy: Always env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-config/config + value: /powermax-reverseproxy-secret/powermax-reverseproxy-secret.yaml - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER @@ -35,12 +35,12 @@ spec: mountPath: /app/tls - name: cert-dir mountPath: /app/certs - - name: powermax-reverseproxy-config - mountPath: /powermax-reverseproxy-config + - name: powermax-reverseproxy-secret + mountPath: /powermax-reverseproxy-secret volumes: - - name: powermax-reverseproxy-config + - name: powermax-reverseproxy-secret secret: - secretName: {{ .Release.Name }}-reverseproxy-config + secretName: {{ .Release.Name }}-reverseproxy-secret - name: tls-secret secret: secretName: {{ .Values.tlsSecret }} From 7cdb2ff6d6a0764822d8e70152e05ccd0b517461 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:14:45 -0800 Subject: [PATCH 22/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index c39d9af0..e427aa37 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -272,6 +272,8 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config + - name: powermax-reverseproxy-secret + mountPath: /powermax-reverseproxy-secret {{- if hasKey .Values.node "topologyControl" }} {{- if eq .Values.node.topologyControl.enabled true }} - name: node-topology-config @@ -468,9 +470,9 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - - name: powermax-reverseproxy-config + - name: powermax-reverseproxy-secret secret: - secretName: {{ .Release.Name }}-reverseproxy-config + secretName: {{ .Release.Name }}-reverseproxy-secret - name: certs secret: secretName: {{ .Release.Name }}-certs From dc4053ba673ba7343d39b9f47a442653bcb7eeaa Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 00:12:08 -0800 Subject: [PATCH 23/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 7828e545..1c0fcd95 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -21,7 +21,7 @@ spec: imagePullPolicy: Always env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-secret/powermax-reverseproxy-secret.yaml + value: /powermax-reverseproxy-secret/config - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER From c3596350584010850b7ee247bc80d78c498cdabb Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 00:16:12 -0800 Subject: [PATCH 24/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 4e73efcb..24a58121 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -503,7 +503,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-secret/powermax-reverseproxy-secret.yaml + value: /powermax-reverseproxy-secret/config - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER From ce09e274987e6f096c484a8eddbd07a6b68fde92 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:24:16 -0800 Subject: [PATCH 25/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 1c0fcd95..73acae96 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,7 +22,7 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-secret/config - - name: X_CSI_REVPROXY_SECRET_NAME + - name: X_CSI_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" From 8336c46d8261d1f1e9d3bd11718de1002c90539f Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:24:52 -0800 Subject: [PATCH 26/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 24a58121..38dfa948 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -504,7 +504,7 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-secret/config - - name: X_CSI_REVPROXY_SECRET_NAME + - name: X_CSI_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" From c8bc6c9041b19da589d83182ea1aa60fc62fcaa0 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:47:27 -0800 Subject: [PATCH 27/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 38dfa948..24a58121 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -504,7 +504,7 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-secret/config - - name: X_CSI_SECRET_NAME + - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" From aac66a682c24aba6de8e665c004f3c1eda6eba39 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:47:54 -0800 Subject: [PATCH 28/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 73acae96..1c0fcd95 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,7 +22,7 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-secret/config - - name: X_CSI_SECRET_NAME + - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" From 3557da2766714fbeb6fc046686dd0031be7e28ac Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:23:10 -0800 Subject: [PATCH 29/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 1c0fcd95..e1e0216a 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -23,7 +23,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-secret/config - name: X_CSI_REVPROXY_SECRET_NAME - value: powermax-reverseproxy-secret.yaml + value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 6d4793805ce77a1d44c84b265f3a7c2a2075ac07 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:23:47 -0800 Subject: [PATCH 30/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 24a58121..263c8fa2 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -505,7 +505,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: /powermax-reverseproxy-secret/config - name: X_CSI_REVPROXY_SECRET_NAME - value: powermax-reverseproxy-secret.yaml + value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 0e5092fddbfaebd9335fd3a32349a348227e316e Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:55:44 -0800 Subject: [PATCH 31/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 263c8fa2..02d5bccc 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -514,7 +514,7 @@ spec: value: {{ .Release.Namespace }} volumeMounts: - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret + mountPath: /powermax-reverseproxy-secret/config - name: tls-secret mountPath: /app/tls - name: cert-dir From 5827676d7597cd8bc97beeca0d3e507b93ff0820 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:56:14 -0800 Subject: [PATCH 32/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index e1e0216a..6333966f 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -36,7 +36,7 @@ spec: - name: cert-dir mountPath: /app/certs - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret + mountPath: /powermax-reverseproxy-secret/config volumes: - name: powermax-reverseproxy-secret secret: From 2f4cadba0e7b1747408c4071388887a24e00a0d3 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:21:26 -0800 Subject: [PATCH 33/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 6333966f..ac332147 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -21,7 +21,7 @@ spec: imagePullPolicy: Always env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-secret/config + value: /powermax-reverseproxy-secret - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER @@ -36,7 +36,7 @@ spec: - name: cert-dir mountPath: /app/certs - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret/config + mountPath: /powermax-reverseproxy-secret volumes: - name: powermax-reverseproxy-secret secret: From ca3e6a55e06655ddb228923555b4865fbafbf81e Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:22:06 -0800 Subject: [PATCH 34/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 02d5bccc..a1736963 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -503,7 +503,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-secret/config + value: /powermax-reverseproxy-secret - name: X_CSI_REVPROXY_SECRET_NAME value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER @@ -514,7 +514,7 @@ spec: value: {{ .Release.Namespace }} volumeMounts: - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret/config + mountPath: /powermax-reverseproxy-secret - name: tls-secret mountPath: /app/tls - name: cert-dir From 522c5b6d3bb74896c5e1e056cd21682ac688bbdf Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:46:50 -0800 Subject: [PATCH 35/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index ac332147..46fe72c9 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -21,9 +21,7 @@ spec: imagePullPolicy: Always env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-secret - - name: X_CSI_REVPROXY_SECRET_NAME - value: powermax-reverseproxy-secret + value: "/etc/powermax/secret/config" - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR @@ -36,7 +34,7 @@ spec: - name: cert-dir mountPath: /app/certs - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret + mountPath: /etc/powermax/secret volumes: - name: powermax-reverseproxy-secret secret: From b9903749d660f3564034abbfabc407c796526179 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:50:24 -0800 Subject: [PATCH 36/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index a1736963..dd537d86 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -503,9 +503,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: X_CSI_REVPROXY_SECRET_PATH - value: /powermax-reverseproxy-secret - - name: X_CSI_REVPROXY_SECRET_NAME - value: powermax-reverseproxy-secret + value: "/etc/powermax/secret/config" - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR @@ -514,7 +512,7 @@ spec: value: {{ .Release.Namespace }} volumeMounts: - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret + mountPath: /etc/powermax/secret - name: tls-secret mountPath: /app/tls - name: cert-dir From 6fc01ff44c82cc80b2cb327e8645e4c0c1a5606e Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:52:31 -0800 Subject: [PATCH 37/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index e427aa37..3dc3dcf3 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -272,8 +272,6 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config - - name: powermax-reverseproxy-secret - mountPath: /powermax-reverseproxy-secret {{- if hasKey .Values.node "topologyControl" }} {{- if eq .Values.node.topologyControl.enabled true }} - name: node-topology-config @@ -470,9 +468,6 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - - name: powermax-reverseproxy-secret - secret: - secretName: {{ .Release.Name }}-reverseproxy-secret - name: certs secret: secretName: {{ .Release.Name }}-certs From 5c4b468a74e75d7ddc9963d0ed4942a64e6eb765 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 13:54:39 -0800 Subject: [PATCH 38/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index dd537d86..bfa42b63 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -504,6 +504,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" + - name: X_CSI_REVPROXY_CONFIG_FILE_NAME + value: config.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 8ea3deddc0ed2028863b23b26a8af24dc27f7421 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 13:56:05 -0800 Subject: [PATCH 39/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index bfa42b63..be066f90 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -504,7 +504,7 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - - name: X_CSI_REVPROXY_CONFIG_FILE_NAME + - name: X_CSI_REVPROXY_SECRET_NAME value: config.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" From fbff4442562a3211306cf86d20e05fe6b22e1d4c Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 13:57:02 -0800 Subject: [PATCH 40/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 46fe72c9..b61d530a 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,6 +22,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" + - name: X_CSI_REVPROXY_SECRET_NAME + value: config.yaml - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From c5deb32b49974f111e7501ef048edeff0e804ea6 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:39:00 -0800 Subject: [PATCH 41/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index be066f90..6c173781 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -505,7 +505,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - name: X_CSI_REVPROXY_SECRET_NAME - value: config.yaml + value: config - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 0094d2f8ffe730b031492d36be176db8e232c3cd Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:39:27 -0800 Subject: [PATCH 42/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index b61d530a..3a9ad206 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -23,7 +23,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - name: X_CSI_REVPROXY_SECRET_NAME - value: config.yaml + value: config - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 10779c4f10504d7ef52854e849d94990ff501198 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:49:33 -0800 Subject: [PATCH 43/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 3a9ad206..46fe72c9 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,8 +22,6 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - - name: X_CSI_REVPROXY_SECRET_NAME - value: config - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From dd785d22c51a840bd8c9f7e504aeea94dc262c18 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:56:09 -0800 Subject: [PATCH 44/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 6c173781..dd537d86 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -504,8 +504,6 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - - name: X_CSI_REVPROXY_SECRET_NAME - value: config - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From ec7e52c6957aa7da5e560e0db39933f22aaff676 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:25:25 -0800 Subject: [PATCH 45/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index dd537d86..b06adbf0 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -462,6 +462,16 @@ spec: value: {{ required "Must provide host group for vsphere" .Values.vSphere.fcHostName }} - name: X_CSI_VCENTER_HOST value: {{ required "Must provide host url for vsphere" .Values.vSphere.vCenterHost }} + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: password - name: X_CSI_VCENTER_USERNAME valueFrom: secretKeyRef: From 3d2b6511560bc51899355af285fbf40b1f673b88 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:27:03 -0800 Subject: [PATCH 46/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 3dc3dcf3..6fef976a 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -245,6 +245,16 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: password volumeMounts: - name: driver-path mountPath: {{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com From aa494a917dfef8ec7ee021ea63a024a9b5e72569 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:29:22 -0800 Subject: [PATCH 47/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 46fe72c9..e7a14f02 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,6 +22,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" + - name: X_CSI_REVPROXY_SECRET_NAME + value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From ccdb630715e5b348feb1e099d733c04c37468f04 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:30:47 -0800 Subject: [PATCH 48/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index b06adbf0..1f1d0a67 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -514,6 +514,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" + - name: X_CSI_REVPROXY_SECRET_NAME + value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 36c8f5a6a99bfcb53c1aa452f4c37b770e0f6097 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:40:53 -0800 Subject: [PATCH 49/86] Add secret name variable for reverseproxy --- charts/csi-powermax/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 75af03c6..f80b2185 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -321,6 +321,8 @@ csireverseproxy: # Default value: None # Examples: "1111", "8080" port: 2222 + # Name of the reverseproxy secret + secretName: powermax-reverseproxy-secret # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate From e6ba33646a073a633a4055fb514414020e0e3f3d Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:50:49 -0800 Subject: [PATCH 50/86] add username and password to driver from secret --- charts/csi-powermax/templates/controller.yaml | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 1f1d0a67..24341f05 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -462,16 +462,6 @@ spec: value: {{ required "Must provide host group for vsphere" .Values.vSphere.fcHostName }} - name: X_CSI_VCENTER_HOST value: {{ required "Must provide host url for vsphere" .Values.vSphere.vCenterHost }} - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} - key: password - name: X_CSI_VCENTER_USERNAME valueFrom: secretKeyRef: @@ -497,6 +487,18 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" + {{- if eq .Values.csireverseproxy.deployAsSidecar true }} + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.csireverseproxy.secretName }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.csireverseproxy.secretName }} + key: password + {{- end}} volumeMounts: - name: socket-dir mountPath: /var/run/csi @@ -515,7 +517,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - name: X_CSI_REVPROXY_SECRET_NAME - value: powermax-reverseproxy-secret + value: {{ .Values.csireverseproxy.secretName }} - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 78ea07bb4034d2a1ea4772dd00fe5a97fad9396f Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:56:41 -0800 Subject: [PATCH 51/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 6fef976a..5b516dca 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -245,16 +245,18 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" + {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} + name: {{ .Values.csireverseproxy.secretName }} key: username - name: X_CSI_POWERMAX_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.global.defaultCredentialsSecret }} + name: {{ .Values.csireverseproxy.secretName }} key: password + {{- end}} volumeMounts: - name: driver-path mountPath: {{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com From d0facfa0a5e7e7f83b16833f68423698cfd7f970 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:26:24 -0800 Subject: [PATCH 52/86] Update values.yaml --- charts/csi-powermax/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index f80b2185..97d2369d 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -322,7 +322,7 @@ csireverseproxy: # Examples: "1111", "8080" port: 2222 # Name of the reverseproxy secret - secretName: powermax-reverseproxy-secret + #secretName: powermax-reverseproxy-secret # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate From 863e5ae008d4a63d62059edb3d3d9c80e5775216 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:27:52 -0800 Subject: [PATCH 53/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 24341f05..43914836 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -487,18 +487,18 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" - {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: password - {{- end}} + #{{- if eq .Values.csireverseproxy.deployAsSidecar true }} + #- name: X_CSI_POWERMAX_USER + # valueFrom: + # secretKeyRef: + # name: {{ .Values.csireverseproxy.secretName }} + # key: username + #- name: X_CSI_POWERMAX_PASSWORD + # valueFrom: + # secretKeyRef: + # name: {{ .Values.csireverseproxy.secretName }} + # key: password + #{{- end}} volumeMounts: - name: socket-dir mountPath: /var/run/csi @@ -516,8 +516,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - - name: X_CSI_REVPROXY_SECRET_NAME - value: {{ .Values.csireverseproxy.secretName }} + #- name: X_CSI_REVPROXY_SECRET_NAME + # value: {{ .Values.csireverseproxy.secretName }} - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 6e20326f5b07dfebcaf8bc83e87337bd3a790230 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:28:45 -0800 Subject: [PATCH 54/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 43914836..1dd86176 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -486,8 +486,7 @@ spec: {{- end }} {{- end }} - name: X_CSI_PODMON_API_PORT - value: "{{ .Values.podmon.podmonAPIPort }}" - #{{- if eq .Values.csireverseproxy.deployAsSidecar true }} + value: "{{ .Values.podmon.podmonAPIPort }} #- name: X_CSI_POWERMAX_USER # valueFrom: # secretKeyRef: From efde73b9ab6229feebffe3d100c985965df1bf0f Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:29:10 -0800 Subject: [PATCH 55/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 5b516dca..3dc3dcf3 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -245,18 +245,6 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" - {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: password - {{- end}} volumeMounts: - name: driver-path mountPath: {{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com From 2f81973b10f3ba54e9758a5086421e050a58b3da Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:29:37 -0800 Subject: [PATCH 56/86] Update reverseproxy.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index e7a14f02..fbcb1d95 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,8 +22,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - - name: X_CSI_REVPROXY_SECRET_NAME - value: powermax-reverseproxy-secret + #- name: X_CSI_REVPROXY_SECRET_NAME + # value: powermax-reverseproxy-secret - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 672999f472dc197dc2c65dd93b5901facd500f2a Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:00:26 -0800 Subject: [PATCH 57/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 1dd86176..315590e1 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -486,18 +486,7 @@ spec: {{- end }} {{- end }} - name: X_CSI_PODMON_API_PORT - value: "{{ .Values.podmon.podmonAPIPort }} - #- name: X_CSI_POWERMAX_USER - # valueFrom: - # secretKeyRef: - # name: {{ .Values.csireverseproxy.secretName }} - # key: username - #- name: X_CSI_POWERMAX_PASSWORD - # valueFrom: - # secretKeyRef: - # name: {{ .Values.csireverseproxy.secretName }} - # key: password - #{{- end}} + value: "{{ .Values.podmon.podmonAPIPort }}" volumeMounts: - name: socket-dir mountPath: /var/run/csi From 80aed9d458c8cb5df6ba150b8dee92833e3e23d1 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:36:46 -0800 Subject: [PATCH 58/86] add username and password variables --- charts/csi-powermax/templates/controller.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 315590e1..a5902761 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -487,6 +487,18 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" + {{- if eq .Values.csireverseproxy.deployAsSidecar true }} + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.csireverseproxy.secretName }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.csireverseproxy.secretName }} + key: password + {{- end}} volumeMounts: - name: socket-dir mountPath: /var/run/csi From 4e423d22f978d0943f3f39eb1444034725e3f6bd Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:37:57 -0800 Subject: [PATCH 59/86] add username and password variables --- charts/csi-powermax/templates/node.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 3dc3dcf3..a9fded76 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -245,6 +245,18 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" + {{- if eq .Values.csireverseproxy.deployAsSidecar true }} + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.csireverseproxy.secretName }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.csireverseproxy.secretName }} + key: password + {{- end}} volumeMounts: - name: driver-path mountPath: {{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com From 0288bfa51c1fabbbb844c1aad4aa8dd5077fcfde Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:38:40 -0800 Subject: [PATCH 60/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index a5902761..271ba816 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -516,8 +516,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - #- name: X_CSI_REVPROXY_SECRET_NAME - # value: {{ .Values.csireverseproxy.secretName }} + - name: X_CSI_REVPROXY_SECRET_NAME + value: {{ .Values.csireverseproxy.secretName }} - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 0d4d4597b747811e34f8e5f86c224419f56c6ed4 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:41:50 -0800 Subject: [PATCH 61/86] Update controller.yaml --- charts/csi-powermax/templates/controller.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 271ba816..315590e1 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -487,18 +487,6 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" - {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: password - {{- end}} volumeMounts: - name: socket-dir mountPath: /var/run/csi @@ -516,8 +504,8 @@ spec: env: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret/config" - - name: X_CSI_REVPROXY_SECRET_NAME - value: {{ .Values.csireverseproxy.secretName }} + #- name: X_CSI_REVPROXY_SECRET_NAME + # value: {{ .Values.csireverseproxy.secretName }} - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR From 628fe40cbaf901ba3df0d3d4d7a8b64eae125263 Mon Sep 17 00:00:00 2001 From: abhi16394 <32352976+abhi16394@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:42:18 -0800 Subject: [PATCH 62/86] Update node.yaml --- charts/csi-powermax/templates/node.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index a9fded76..3dc3dcf3 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -245,18 +245,6 @@ spec: {{- end }} - name: X_CSI_PODMON_API_PORT value: "{{ .Values.podmon.podmonAPIPort }}" - {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - - name: X_CSI_POWERMAX_USER - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: username - - name: X_CSI_POWERMAX_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.csireverseproxy.secretName }} - key: password - {{- end}} volumeMounts: - name: driver-path mountPath: {{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com From 4437b3a6a1393e5eca5eff97678665943343edc4 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Fri, 10 Jan 2025 13:07:16 -0500 Subject: [PATCH 63/86] Revert "remove configmap" This reverts commit b349977ac25a3f6db011ae9ab435e081388907f5. --- .../charts/csireverseproxy/templates/configmap.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 8b137891..27938ea4 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -1 +1,7 @@ - +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-reverseproxy-config + namespace: {{ .Release.Namespace }} +data: +{{ tpl (.Files.Glob "conf/config.yaml").AsConfig . | indent 2 }} From 74a35af1c3b078d84d496243ffe60d0803195656 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Mon, 13 Jan 2025 17:23:03 -0500 Subject: [PATCH 64/86] restore backward compat and update proxy secret --- .../charts/csireverseproxy/conf/config.yaml | 3 +- .../templates/reverseproxy.yaml | 33 +++++++++++--- charts/csi-powermax/templates/controller.yaml | 43 ++++++++++++++++--- charts/csi-powermax/templates/node.yaml | 24 ++++++++--- charts/csi-powermax/values.yaml | 4 +- 5 files changed, 86 insertions(+), 21 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml b/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml index e4355f9f..51ed5390 100644 --- a/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml @@ -1,7 +1,8 @@ +mode: "StandAlone" port: {{ .Values.port }} logLevel: {{ .Values.global.logLevel | default "debug" }} logFormat: {{ .Values.global.logFormat | default "TEXT" }} -config: +standAloneConfig: {{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret }} storageArrays: {{- $_ := first .Values.global.storageArrays }} diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index fbcb1d95..a95276cf 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,10 +20,19 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: + {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax/secret/config" - #- name: X_CSI_REVPROXY_SECRET_NAME - # value: powermax-reverseproxy-secret + value: "/etc/powermax/secret" + - name: X_CSI_REVPROXY_SECRET_NAME + value: {{ .Values.secretName }} + - name: X_CSI_USE_REVPROXY_SECRET + value: "true" + {{- else }} + - name: X_CSI_REVPROXY_CONFIG_DIR + value: /etc/config/configmap + - name: X_CSI_REVPROXY_CONFIG_FILE_NAME + value: config.yaml + {{- end }} - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR @@ -31,16 +40,28 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: + {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + - name: powermax-reverseproxy-secret + mountPath: /etc/powermax/secret + {{- else }} + - name: configmap-volume + mountPath: /etc/config/configmap + {{- end }} - name: tls-secret mountPath: /app/tls - name: cert-dir mountPath: /app/certs - - name: powermax-reverseproxy-secret - mountPath: /etc/powermax/secret volumes: + {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} - name: powermax-reverseproxy-secret secret: - secretName: {{ .Release.Name }}-reverseproxy-secret + secretName: {{ .Values.secretName }} + {{- else }} + - name: configmap-volume + configMap: + name: {{ .Release.Name }}-reverseproxy-config + optional: true + {{- end }} - name: tls-secret secret: secretName: {{ .Values.tlsSecret }} diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 315590e1..d283f558 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,6 +414,16 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: password - name: X_CSI_POWERMAX_CONFIG_PATH value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH @@ -502,10 +512,19 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax/secret/config" - #- name: X_CSI_REVPROXY_SECRET_NAME - # value: {{ .Values.csireverseproxy.secretName }} + value: "/etc/powermax/secret" + - name: X_CSI_REVPROXY_SECRET_NAME + value: {{ .Values.csireverseproxy.secretName }} + - name: X_CSI_USE_REVPROXY_SECRET + value: "true" + {{- else}} + - name: X_CSI_REVPROXY_CONFIG_DIR + value: /etc/config/configmap + - name: X_CSI_REVPROXY_CONFIG_FILE_NAME + value: config.yaml + {{- end }} - name: X_CSI_REVRPOXY_IN_CLUSTER value: "true" - name: X_CSI_REVPROXY_TLS_CERT_DIR @@ -513,8 +532,13 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax/secret + {{- else }} + - name: configmap-volume + mountPath: /etc/config/configmap + {{- end }} - name: tls-secret mountPath: /app/tls - name: cert-dir @@ -527,12 +551,19 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + - name: powermax-reverseproxy-secret + secret: + secretName: {{ .Values.csireverseproxy.secretName }} + {{- else }} + - name: configmap-volume + configMap: + name: {{ .Release.Name }}-reverseproxy-config + optional: true + {{- end }} - name: tls-secret secret: secretName: {{ .Values.csireverseproxy.tlsSecret }} - - name: powermax-reverseproxy-secret - secret: - secretName: {{ .Release.Name }}-reverseproxy-secret - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 3dc3dcf3..62689abb 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -95,8 +95,8 @@ metadata: {{- if eq .Values.authorization.enabled true }} annotations: com.dell.karavi-authorization-proxy: "true" - {{ end }} - {{ end }} + {{- end }} + {{- end }} spec: selector: matchLabels: @@ -112,14 +112,14 @@ spec: {{- end }} spec: serviceAccountName: {{ .Release.Name }}-node - {{ if .Values.node.nodeSelector }} + {{- if .Values.node.nodeSelector }} nodeSelector: {{- toYaml .Values.node.nodeSelector | nindent 8 }} - {{ end }} - {{ if .Values.node.tolerations }} + {{- end }} + {{- if .Values.node.tolerations }} tolerations: {{- toYaml .Values.node.tolerations | nindent 6 }} - {{ end }} + {{- end }} hostIPC: true hostNetwork: true dnsPolicy: ClusterFirstWithHostNet @@ -162,6 +162,16 @@ spec: value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.global.defaultCredentialsSecret }} + key: password - name: X_CSI_POWERMAX_NODENAME valueFrom: fieldRef: @@ -271,7 +281,7 @@ spec: - name: powermax-config-params mountPath: /powermax-config-params - name: powermax-array-config - mountPath: /powermax-array-config + mountPath: /powermax-array-config {{- if hasKey .Values.node "topologyControl" }} {{- if eq .Values.node.topologyControl.enabled true }} - name: node-topology-config diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 97d2369d..8f4e2db5 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -19,6 +19,8 @@ global: # Default value: None # Examples: "000000000001", "000000000002" managedArrays: "000000000001,000000000002" + # defaultCredentialsSecret + defaultCredentialsSecret: powermax-creds # portGroups: Define the set of existing port groups that the driver will use. # It is a comma separated list of portgroup names. # Required only in case of iSCSI port groups @@ -322,7 +324,7 @@ csireverseproxy: # Examples: "1111", "8080" port: 2222 # Name of the reverseproxy secret - #secretName: powermax-reverseproxy-secret + secretName: powermax-reverseproxy-secret # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate From 4800a9571fcbb5d2f2e64abe9a25692ba3a7b273 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Mon, 13 Jan 2025 17:23:45 -0500 Subject: [PATCH 65/86] remove unused X_CSI_POWERMAX_ENDPOINT --- charts/csi-powermax/templates/powermax-array-config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/csi-powermax/templates/powermax-array-config.yaml b/charts/csi-powermax/templates/powermax-array-config.yaml index 28f58939..78b33bd5 100644 --- a/charts/csi-powermax/templates/powermax-array-config.yaml +++ b/charts/csi-powermax/templates/powermax-array-config.yaml @@ -7,8 +7,4 @@ data: powermax-array-config.yaml: | X_CSI_POWERMAX_PORTGROUPS: {{ .Values.global.portGroups | toYaml | default "" }} X_CSI_TRANSPORT_PROTOCOL: {{ .Values.global.transportProtocol | toYaml | default "" }} - {{- $_ := first .Values.global.storageArrays }} - {{- range $index, $value := .Values.global.storageArrays }} - X_CSI_POWERMAX_ENDPOINT: {{ $value.endpoint | toYaml | default "" }} - {{- end }} X_CSI_MANAGED_ARRAYS: {{ .Values.global.managedArrays | toYaml | default "" }} From fb60b083d8eae92443a356fdaca9ec8bd017207d Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 14 Jan 2025 16:38:46 -0500 Subject: [PATCH 66/86] simplify logic for switching btwn secret and cm. hasKey doesn't do much, because if it is not defined in the user-provided values file, it will be provided by the default values. --- .../charts/csireverseproxy/templates/configmap.yaml | 10 ++++++++++ .../charts/csireverseproxy/templates/reverseproxy.yaml | 6 +++--- charts/csi-powermax/charts/csireverseproxy/values.yaml | 5 +++++ charts/csi-powermax/templates/controller.yaml | 6 +++--- charts/csi-powermax/values.yaml | 4 +++- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 27938ea4..7d9cabf2 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -1,3 +1,12 @@ +{{- /* +Deprecation notice: use of reverseproxy-config ConfigMap is deprecated and will +be removed in a future release. The ConfigMap remains for backward compatibility +usage only. +*/}} +{{- /* +Use the ConfigMap only if the secretName value is empty or the key is not found +*/}} +{{- if empty .Values.secretName }} apiVersion: v1 kind: ConfigMap metadata: @@ -5,3 +14,4 @@ metadata: namespace: {{ .Release.Namespace }} data: {{ tpl (.Files.Glob "conf/config.yaml").AsConfig . | indent 2 }} +{{- end }} \ No newline at end of file diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index a95276cf..a152642f 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,7 +20,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + {{- if not (empty .Values.secretName) }} - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret" - name: X_CSI_REVPROXY_SECRET_NAME @@ -40,7 +40,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + {{- if not (empty .Values.secretName) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax/secret {{- else }} @@ -52,7 +52,7 @@ spec: - name: cert-dir mountPath: /app/certs volumes: - {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + {{- if not (empty .Values.secretName) }} - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.secretName }} diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index 72ee0efd..9bff8ebd 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -5,3 +5,8 @@ port: 2222 # Don't change this value unless really necessary # If this value is modified, then the installation script will have to be modified tlsSecret: "csirevproxy-tls-secret" + +# Name of the reverseproxy secret as a Kubernetes resource. +# Default value: "powermax-reverseproxy-secret" +# Example: "powermax-reverseproxy-secret" +secretName: powermax-reverseproxy-secret \ No newline at end of file diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index d283f558..10224931 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -512,7 +512,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if not (empty .Values.csireverseproxy.secretName) }} - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax/secret" - name: X_CSI_REVPROXY_SECRET_NAME @@ -532,7 +532,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if not (empty .Values.csireverseproxy.secretName) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax/secret {{- else }} @@ -551,7 +551,7 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if not (empty .Values.csireverseproxy.secretName) }} - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.csireverseproxy.secretName }} diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 8f4e2db5..7f5f9adc 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -323,7 +323,9 @@ csireverseproxy: # Default value: None # Examples: "1111", "8080" port: 2222 - # Name of the reverseproxy secret + # Name of the reverseproxy secret as a Kubernetes resource. + # Default value: "powermax-reverseproxy-secret" + # Example: "powermax-reverseproxy-secret" secretName: powermax-reverseproxy-secret # Auto-create TLS certificate for csi-reverseproxy certManager: From e493b0512679a823a22a555e480d93ef1797af13 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 14 Jan 2025 16:39:42 -0500 Subject: [PATCH 67/86] create rev proxy secret dynamically --- .../templates/_reverseproxy-secret.tpl | 41 +++++++++++++++++++ .../csireverseproxy/templates/secret.yaml | 10 +++++ 2 files changed, 51 insertions(+) create mode 100644 charts/csi-powermax/charts/csireverseproxy/templates/_reverseproxy-secret.tpl create mode 100644 charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/_reverseproxy-secret.tpl b/charts/csi-powermax/charts/csireverseproxy/templates/_reverseproxy-secret.tpl new file mode 100644 index 00000000..31afb510 --- /dev/null +++ b/charts/csi-powermax/charts/csireverseproxy/templates/_reverseproxy-secret.tpl @@ -0,0 +1,41 @@ +{{/* +Template for creating the reverse proxy secret contents. +Using this template allows us to easily include the data and base64 encode +it in one command from the secret.yaml file. +*/}} +{{- define "reverseproxy.secret" -}} +{{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret -}} +storageArrays: + {{- $_ := first .Values.global.storageArrays }} + {{- range $index, $value := .Values.global.storageArrays }} + - storageArrayId: {{ required "Must provide a storage array id." $value.storageArrayId | toJson }} + primaryURL: {{ required "Must provide a primary Unisphere HTTPS endpoint." $value.endpoint }} + backupURL: {{ $value.backupEndpoint | default "" }} + proxyCredentialSecrets: + - {{ required "Must provide secret for proxy credentials" $defaultProxyCreds }} + {{- end }} +managementServers: + {{- $_ := first .Values.global.managementServers }} + {{- range $index, $value := .Values.global.managementServers }} + - url: {{required "Must provide a Unisphere HTTPS endpoint." $value.endpoint }} + {{- if empty $value.credentialsSecret }} + arrayCredentialSecret: {{ required "Must provide an array credential secret" $defaultProxyCreds }} + {{- else }} + arrayCredentialSecret: {{ required "Must provide an array credential secret" $value.credentialsSecret }} + {{- end }} + {{- if $value.certSecret }} + {{- $check := toString $value.skipCertificateValidation }} + skipCertificateValidation: {{ ternary $value.skipCertificateValidation true (or (eq $check "true") (eq $check "false")) }} + {{- else }} + skipCertificateValidation: true + {{- end }} + certSecret: {{ $value.certSecret | default "" }} + {{- if $value.limits }} + limits: + maxActiveRead: {{ $value.limits.maxActiveRead | default 0 }} + maxActiveWrite: {{ $value.limits.maxActiveWrite | default 0 }} + maxOutStandingRead: {{ $value.limits.maxOutStandingRead | default 0 }} + maxOutStandingWrite: {{ $value.limits.maxOutStandingWrite | default 0 }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml new file mode 100644 index 00000000..f29617ec --- /dev/null +++ b/charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml @@ -0,0 +1,10 @@ +{{- if not (empty .Values.secretName) }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ .Values.secretName }} + namespace: {{ .Release.Namespace }} +type: Opaque +data: + config: {{ include "reverseproxy.secret" . | b64enc }} +{{- end }} \ No newline at end of file From 3bc970a9abb6c5082dab866a3ec3e84dfd03f1d2 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 14 Jan 2025 16:53:09 -0500 Subject: [PATCH 68/86] rename secret template file --- .../templates/{_reverseproxy-secret.tpl => _secret-config.tpl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename charts/csi-powermax/charts/csireverseproxy/templates/{_reverseproxy-secret.tpl => _secret-config.tpl} (100%) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/_reverseproxy-secret.tpl b/charts/csi-powermax/charts/csireverseproxy/templates/_secret-config.tpl similarity index 100% rename from charts/csi-powermax/charts/csireverseproxy/templates/_reverseproxy-secret.tpl rename to charts/csi-powermax/charts/csireverseproxy/templates/_secret-config.tpl From 0168069cac8a2c311dcb0773d02e0e5d5c8a8f41 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 14 Jan 2025 17:17:13 -0500 Subject: [PATCH 69/86] add newline --- charts/csi-powermax/charts/csireverseproxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index 9bff8ebd..9800adaa 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -9,4 +9,4 @@ tlsSecret: "csirevproxy-tls-secret" # Name of the reverseproxy secret as a Kubernetes resource. # Default value: "powermax-reverseproxy-secret" # Example: "powermax-reverseproxy-secret" -secretName: powermax-reverseproxy-secret \ No newline at end of file +secretName: powermax-reverseproxy-secret From 33a1310725334ab21022f18191cb37f02a26f224 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Wed, 15 Jan 2025 12:26:56 -0500 Subject: [PATCH 70/86] remove dynamic secret. - the secret should be created by the user as it will have a different format than the previous proxy configmap. --- .../templates/_secret-config.tpl | 41 ------------------- .../csireverseproxy/templates/secret.yaml | 10 ----- 2 files changed, 51 deletions(-) delete mode 100644 charts/csi-powermax/charts/csireverseproxy/templates/_secret-config.tpl delete mode 100644 charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/_secret-config.tpl b/charts/csi-powermax/charts/csireverseproxy/templates/_secret-config.tpl deleted file mode 100644 index 31afb510..00000000 --- a/charts/csi-powermax/charts/csireverseproxy/templates/_secret-config.tpl +++ /dev/null @@ -1,41 +0,0 @@ -{{/* -Template for creating the reverse proxy secret contents. -Using this template allows us to easily include the data and base64 encode -it in one command from the secret.yaml file. -*/}} -{{- define "reverseproxy.secret" -}} -{{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret -}} -storageArrays: - {{- $_ := first .Values.global.storageArrays }} - {{- range $index, $value := .Values.global.storageArrays }} - - storageArrayId: {{ required "Must provide a storage array id." $value.storageArrayId | toJson }} - primaryURL: {{ required "Must provide a primary Unisphere HTTPS endpoint." $value.endpoint }} - backupURL: {{ $value.backupEndpoint | default "" }} - proxyCredentialSecrets: - - {{ required "Must provide secret for proxy credentials" $defaultProxyCreds }} - {{- end }} -managementServers: - {{- $_ := first .Values.global.managementServers }} - {{- range $index, $value := .Values.global.managementServers }} - - url: {{required "Must provide a Unisphere HTTPS endpoint." $value.endpoint }} - {{- if empty $value.credentialsSecret }} - arrayCredentialSecret: {{ required "Must provide an array credential secret" $defaultProxyCreds }} - {{- else }} - arrayCredentialSecret: {{ required "Must provide an array credential secret" $value.credentialsSecret }} - {{- end }} - {{- if $value.certSecret }} - {{- $check := toString $value.skipCertificateValidation }} - skipCertificateValidation: {{ ternary $value.skipCertificateValidation true (or (eq $check "true") (eq $check "false")) }} - {{- else }} - skipCertificateValidation: true - {{- end }} - certSecret: {{ $value.certSecret | default "" }} - {{- if $value.limits }} - limits: - maxActiveRead: {{ $value.limits.maxActiveRead | default 0 }} - maxActiveWrite: {{ $value.limits.maxActiveWrite | default 0 }} - maxOutStandingRead: {{ $value.limits.maxOutStandingRead | default 0 }} - maxOutStandingWrite: {{ $value.limits.maxOutStandingWrite | default 0 }} - {{- end }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml deleted file mode 100644 index f29617ec..00000000 --- a/charts/csi-powermax/charts/csireverseproxy/templates/secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- if not (empty .Values.secretName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ .Values.secretName }} - namespace: {{ .Release.Namespace }} -type: Opaque -data: - config: {{ include "reverseproxy.secret" . | b64enc }} -{{- end }} \ No newline at end of file From 5466ae86aacbdbc12c65e416fa07881c30b1cb1e Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Wed, 15 Jan 2025 12:49:16 -0500 Subject: [PATCH 71/86] update secret usage var name for clarity --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- charts/csi-powermax/templates/controller.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index a152642f..43079a82 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -25,7 +25,7 @@ spec: value: "/etc/powermax/secret" - name: X_CSI_REVPROXY_SECRET_NAME value: {{ .Values.secretName }} - - name: X_CSI_USE_REVPROXY_SECRET + - name: X_CSI_REVPROXY_USE_SECRET value: "true" {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 10224931..64f44f8f 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -517,7 +517,7 @@ spec: value: "/etc/powermax/secret" - name: X_CSI_REVPROXY_SECRET_NAME value: {{ .Values.csireverseproxy.secretName }} - - name: X_CSI_USE_REVPROXY_SECRET + - name: X_CSI_REVPROXY_USE_SECRET value: "true" {{- else}} - name: X_CSI_REVPROXY_CONFIG_DIR From 8b0672611fe31d093754dbcd5467b6149e20fb0d Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Wed, 15 Jan 2025 12:52:36 -0500 Subject: [PATCH 72/86] update volume mount path for secret --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 4 ++-- charts/csi-powermax/templates/controller.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 43079a82..04dd749b 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -22,7 +22,7 @@ spec: env: {{- if not (empty .Values.secretName) }} - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax/secret" + value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME value: {{ .Values.secretName }} - name: X_CSI_REVPROXY_USE_SECRET @@ -42,7 +42,7 @@ spec: volumeMounts: {{- if not (empty .Values.secretName) }} - name: powermax-reverseproxy-secret - mountPath: /etc/powermax/secret + mountPath: /etc/powermax {{- else }} - name: configmap-volume mountPath: /etc/config/configmap diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 64f44f8f..140b4f3d 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -514,7 +514,7 @@ spec: env: {{- if not (empty .Values.csireverseproxy.secretName) }} - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax/secret" + value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME value: {{ .Values.csireverseproxy.secretName }} - name: X_CSI_REVPROXY_USE_SECRET @@ -534,7 +534,7 @@ spec: volumeMounts: {{- if not (empty .Values.csireverseproxy.secretName) }} - name: powermax-reverseproxy-secret - mountPath: /etc/powermax/secret + mountPath: /etc/powermax {{- else }} - name: configmap-volume mountPath: /etc/config/configmap From ad45eadc7382fe8c01d8bc889472be95999b4701 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Wed, 15 Jan 2025 14:09:31 -0500 Subject: [PATCH 73/86] simplify logic and add proxy secret to controller and node containers --- .../templates/reverseproxy.yaml | 7 +++--- charts/csi-powermax/templates/controller.yaml | 22 +++++++++++++++---- charts/csi-powermax/templates/node.yaml | 18 +++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 04dd749b..591a9540 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,13 +20,14 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - {{- if not (empty .Values.secretName) }} + {{- $useRevProxySecret := not (empty .Values.secretName) }} + - name: X_CSI_REVPROXY_USE_SECRET + value: {{ $useRevProxySecret | quote }} + {{- if $useRevProxySecret }} - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME value: {{ .Values.secretName }} - - name: X_CSI_REVPROXY_USE_SECRET - value: "true" {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 140b4f3d..87e1a050 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -428,6 +428,15 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml + {{- $useRevProxySecret := not (empty .Values.csireverseproxy.secretName) }} + - name: X_CSI_REVPROXY_USE_SECRET + value: {{ $useRevProxySecret | quote }} + {{- if $useRevProxySecret }} + - name: X_CSI_REVPROXY_SECRET_PATH + value: "/etc/powermax" + - name: X_CSI_REVPROXY_SECRET_NAME + value: {{ .Values.csireverseproxy.secretName }} + {{- end }} - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} - name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION @@ -507,19 +516,24 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config + {{- if not (empty .Values.csireverseproxy.secretName) }} + - name: powermax-reverseproxy-secret + mountPath: /etc/powermax + {{- end }} {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - name: reverseproxy image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - {{- if not (empty .Values.csireverseproxy.secretName) }} + {{- $useRevProxySecret := not (empty .Values.csireverseproxy.secretName) }} + - name: X_CSI_REVPROXY_USE_SECRET + value: {{ $useRevProxySecret | quote }} + {{- if $useRevProxySecret }} - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME value: {{ .Values.csireverseproxy.secretName }} - - name: X_CSI_REVPROXY_USE_SECRET - value: "true" - {{- else}} + {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap - name: X_CSI_REVPROXY_CONFIG_FILE_NAME diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 26b5b8c2..4914c9e0 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -177,6 +177,15 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + {{- $useRevProxySecret := not (empty .Values.csireverseproxy.secretName) }} + - name: X_CSI_REVPROXY_USE_SECRET + value: {{ $useRevProxySecret | quote }} + {{- if $useRevProxySecret }} + - name: X_CSI_REVPROXY_SECRET_PATH + value: "/etc/powermax" + - name: X_CSI_REVPROXY_SECRET_NAME + value: {{ .Values.csireverseproxy.secretName }} + {{- end }} {{- if eq .Values.enableCHAP true }} - name: X_CSI_POWERMAX_ISCSI_ENABLE_CHAP value: "true" @@ -285,6 +294,10 @@ spec: mountPath: /node-topology-config {{- end }} {{- end }} + {{- if not (empty .Values.csireverseproxy.secretName) }} + - name: powermax-reverseproxy-secret + mountPath: /etc/powermax + {{- end }} - name: registrar image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar.image }} args: @@ -475,6 +488,11 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config + {{- if not (empty .Values.csireverseproxy.secretName) }} + - name: powermax-reverseproxy-secret + secret: + secretName: {{ .Values.csireverseproxy.secretName }} + {{- end }} - name: certs secret: secretName: {{ .Release.Name }}-certs From 5d1fe44c6d00f5bdebdfec7f77056ceec696bf6c Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Wed, 15 Jan 2025 14:18:49 -0500 Subject: [PATCH 74/86] deprecate managementServers, storageArrays, and defaultCredentialsSecret. - add logic to dynamically create envs for defaultCredentialsSecret for backward compat only. - remove final reference to X_CSI_POWERMAX_ENDPOINT. --- charts/csi-powermax/templates/controller.yaml | 2 ++ charts/csi-powermax/templates/node.yaml | 5 ++--- charts/csi-powermax/values.yaml | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 87e1a050..a0cfc7d6 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,6 +414,7 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller + {{- if empty .Values.csireverseproxy.secretName }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -424,6 +425,7 @@ spec: secretKeyRef: name: {{ .Values.global.defaultCredentialsSecret }} key: password + {{- end }} - name: X_CSI_POWERMAX_CONFIG_PATH value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 4914c9e0..20b90d7a 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -153,15 +153,13 @@ spec: value: "{{ .Values.maxPowerMaxVolumesPerNode }}" - name: X_CSI_PRIVATE_MOUNT_DIR value: "{{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com/disks" - {{- $managementServer := first .Values.global.managementServers }} - - name: X_CSI_POWERMAX_ENDPOINT - value: {{ required "Must provide a Unisphere HTTPS endpoint." $managementServer.endpoint }} - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} - name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} + {{- if empty .Values.csireverseproxy.secretName }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -172,6 +170,7 @@ spec: secretKeyRef: name: {{ .Values.global.defaultCredentialsSecret }} key: password + {{- end }} - name: X_CSI_POWERMAX_NODENAME valueFrom: fieldRef: diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index a3c9690d..47cd8f6a 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -19,7 +19,12 @@ global: # Default value: None # Examples: "000000000001", "000000000002" managedArrays: "000000000001,000000000002" + # defaultCredentialsSecret + # DEPRECATION NOTICE: The defaultCredentials parameter has been deprecated and will be + # removed in a future release. It remains for backward compatibility only. + # Please see use the parameter .csireverseproxy.secretName below and refer to the official + # documentation website for further details. defaultCredentialsSecret: powermax-creds # portGroups: Define the set of existing port groups that the driver will use. # It is a comma separated list of portgroup names. @@ -37,6 +42,11 @@ global: # "" - Automatic selection of transport protocol # Default value: "" transportProtocol: "" + + # DEPRECATION NOTICE: The storageArrays parameter has been deprecated in this helm chart + # and will be removed in a future release. It remains for backward compatibility only. + # storageArrays have been migrated to the 'secret' format. Please refer to the official + # documentation website for further details. storageArrays: - storageArrayId: "000000000001" endpoint: https://primary-1.unisphe.re:8443 @@ -44,6 +54,11 @@ global: # - storageArrayId: "000000000002" # endpoint: https://primary-2.unisphe.re:8443 # backupEndpoint: https://backup-2.unisphe.re:8443 + + # DEPRECATION NOTICE: The managementServers parameter has been deprecated in this helm chart + # and will be removed in a future release. It remains for backward compatibility only. + # managementServers have been migrated to the 'secret' format. Please refer to the official + # documentation website for further details. managementServers: - endpoint: https://primary-1.unisphe.re:8443 credentialsSecret: primary-1-secret From ccc1865582dac72ae61eb0b69e35f98ef29ac92a Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Thu, 16 Jan 2025 17:03:34 -0500 Subject: [PATCH 75/86] fix bug related to secret file name - the secret file name must be "config" because of the way we create the secret; --from-file=config=secret.yaml --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 2 +- charts/csi-powermax/templates/controller.yaml | 4 ++-- charts/csi-powermax/templates/node.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 591a9540..7d8a0d68 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -27,7 +27,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME - value: {{ .Values.secretName }} + value: config {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index a0cfc7d6..510b10dd 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -437,7 +437,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME - value: {{ .Values.csireverseproxy.secretName }} + value: config {{- end }} - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} @@ -534,7 +534,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME - value: {{ .Values.csireverseproxy.secretName }} + value: config {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 20b90d7a..59b6dcfc 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -183,7 +183,7 @@ spec: - name: X_CSI_REVPROXY_SECRET_PATH value: "/etc/powermax" - name: X_CSI_REVPROXY_SECRET_NAME - value: {{ .Values.csireverseproxy.secretName }} + value: config {{- end }} {{- if eq .Values.enableCHAP true }} - name: X_CSI_POWERMAX_ISCSI_ENABLE_CHAP From 6b78f99e4689f734f43b4a8cbe501b388416acbc Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Fri, 17 Jan 2025 12:36:25 -0500 Subject: [PATCH 76/86] consolidate secret file path to a single env var --- .../csireverseproxy/templates/reverseproxy.yaml | 6 ++---- charts/csi-powermax/templates/controller.yaml | 12 ++++-------- charts/csi-powermax/templates/node.yaml | 6 ++---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 7d8a0d68..364f509c 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -24,10 +24,8 @@ spec: - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} - - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax" - - name: X_CSI_REVPROXY_SECRET_NAME - value: config + - name: X_CSI_REVPROXY_SECRET_FILEPATH + value: "/etc/powermax/config" {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index ebffe167..bb23640b 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -434,10 +434,8 @@ spec: - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} - - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax" - - name: X_CSI_REVPROXY_SECRET_NAME - value: config + - name: X_CSI_REVPROXY_SECRET_FILEPATH + value: "/etc/powermax/config" {{- end }} - name: X_CSI_POWERMAX_DEBUG value: {{ .Values.powerMaxDebug | default "false" | lower | quote }} @@ -535,10 +533,8 @@ spec: - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} - - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax" - - name: X_CSI_REVPROXY_SECRET_NAME - value: config + - name: X_CSI_REVPROXY_SECRET_FILEPATH + value: "/etc/powermax/config" {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 6f3db397..a761d4f8 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -180,10 +180,8 @@ spec: - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} - - name: X_CSI_REVPROXY_SECRET_PATH - value: "/etc/powermax" - - name: X_CSI_REVPROXY_SECRET_NAME - value: config + - name: X_CSI_REVPROXY_SECRET_FILEPATH + value: "/etc/powermax/config" {{- end }} {{- if eq .Values.enableCHAP true }} - name: X_CSI_POWERMAX_ISCSI_ENABLE_CHAP From 4f89c4374099b65750103fef0ed699709d8ce80e Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Fri, 17 Jan 2025 13:31:36 -0500 Subject: [PATCH 77/86] mount powermax-config-params in the reverse proxy ctr. - mounting the configmap in order to pass logging configs to the reverse proxy. --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 7 +++++++ charts/csi-powermax/templates/controller.yaml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 364f509c..a014922c 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -26,6 +26,8 @@ spec: {{- if $useRevProxySecret }} - name: X_CSI_REVPROXY_SECRET_FILEPATH value: "/etc/powermax/config" + - name: X_CSI_POWERMAX_CONFIG_PATH + value: /powermax-config-params/driver-config-params.yaml {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap @@ -42,6 +44,8 @@ spec: {{- if not (empty .Values.secretName) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax + - name: powermax-config-params + mountPath: /powermax-config-params {{- else }} - name: configmap-volume mountPath: /etc/config/configmap @@ -55,6 +59,9 @@ spec: - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.secretName }} + - name: powermax-config-params + configMap: + name: {{ .Release.Name }}-config-params {{- else }} - name: configmap-volume configMap: diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index bb23640b..44a07057 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -535,6 +535,8 @@ spec: {{- if $useRevProxySecret }} - name: X_CSI_REVPROXY_SECRET_FILEPATH value: "/etc/powermax/config" + - name: X_CSI_POWERMAX_CONFIG_PATH + value: /powermax-config-params/driver-config-params.yaml {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap @@ -551,6 +553,8 @@ spec: {{- if not (empty .Values.csireverseproxy.secretName) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax + - name: powermax-config-params + mountPath: /powermax-config-params {{- else }} - name: configmap-volume mountPath: /etc/config/configmap From 3cba131f419aaf9c427fffbf9bcdd113e0af9458 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Fri, 17 Jan 2025 14:42:39 -0500 Subject: [PATCH 78/86] bump image, value, and chart versions --- charts/csi-powermax/Chart.yaml | 6 +++--- charts/csi-powermax/charts/csireverseproxy/Chart.yaml | 4 ++-- charts/csi-powermax/charts/csireverseproxy/values.yaml | 2 +- charts/csi-powermax/values.yaml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/csi-powermax/Chart.yaml b/charts/csi-powermax/Chart.yaml index b65c3e6b..58026c94 100644 --- a/charts/csi-powermax/Chart.yaml +++ b/charts/csi-powermax/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -appVersion: "2.13.0" +appVersion: "2.14.0" name: csi-powermax -version: 2.13.0 +version: 2.14.0 description: | PowerMax CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as @@ -15,7 +15,7 @@ keywords: - storage dependencies: - name: csireverseproxy - version: 2.12.0 + version: 2.13.0 condition: required home: https://github.com/dell/csi-powermax icon: https://avatars1.githubusercontent.com/u/20958494?s=200&v=4 diff --git a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml index 4c172dda..757223bd 100644 --- a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for CSI PowerMax ReverseProxy type: application -version: 2.12.0 +version: 2.13.0 -appVersion: 2.12.0 +appVersion: 2.13.0 diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index 938af4fd..75c8d0ca 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -1,4 +1,4 @@ -image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0 +image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.13.0 port: 2222 # TLS secret which is used for setting up the proxy HTTPS server diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 3d0fc6f8..331a0ffe 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -82,16 +82,16 @@ global: # Current version of the driver # Don't modify this value as this value will be used by the install script -version: "v2.13.0" +version: "v2.14.0" # "images" defines every container images used for the driver and its sidecars. # To use your own images, or a private registry, change the values here. images: # "driver" defines the container image, used for the driver container. driver: - image: quay.io/dell/container-storage-modules/csi-powermax:v2.13.0 + image: quay.io/dell/container-storage-modules/csi-powermax:v2.14.0 csireverseproxy: - image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0 + image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.13.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0 From d92583a35001be0b5244f7212e51cd50669ff084 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Fri, 17 Jan 2025 14:49:10 -0500 Subject: [PATCH 79/86] Revert commit 4f89c43 in favor of one change per PR. This reverts commit 4f89c4374099b65750103fef0ed699709d8ce80e. --- .../charts/csireverseproxy/templates/reverseproxy.yaml | 7 ------- charts/csi-powermax/templates/controller.yaml | 4 ---- 2 files changed, 11 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index a014922c..364f509c 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -26,8 +26,6 @@ spec: {{- if $useRevProxySecret }} - name: X_CSI_REVPROXY_SECRET_FILEPATH value: "/etc/powermax/config" - - name: X_CSI_POWERMAX_CONFIG_PATH - value: /powermax-config-params/driver-config-params.yaml {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap @@ -44,8 +42,6 @@ spec: {{- if not (empty .Values.secretName) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax - - name: powermax-config-params - mountPath: /powermax-config-params {{- else }} - name: configmap-volume mountPath: /etc/config/configmap @@ -59,9 +55,6 @@ spec: - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.secretName }} - - name: powermax-config-params - configMap: - name: {{ .Release.Name }}-config-params {{- else }} - name: configmap-volume configMap: diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 44a07057..bb23640b 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -535,8 +535,6 @@ spec: {{- if $useRevProxySecret }} - name: X_CSI_REVPROXY_SECRET_FILEPATH value: "/etc/powermax/config" - - name: X_CSI_POWERMAX_CONFIG_PATH - value: /powermax-config-params/driver-config-params.yaml {{- else }} - name: X_CSI_REVPROXY_CONFIG_DIR value: /etc/config/configmap @@ -553,8 +551,6 @@ spec: {{- if not (empty .Values.csireverseproxy.secretName) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax - - name: powermax-config-params - mountPath: /powermax-config-params {{- else }} - name: configmap-volume mountPath: /etc/config/configmap From f69fdae2d5701aebe12d106cfccbef158582c873 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Fri, 17 Jan 2025 16:09:31 -0500 Subject: [PATCH 80/86] PR comments: tdawe - update default value for secretName in both values files. - update secret-configMap switching logic to check for existing secretName key, for better backward compat. --- .../charts/csireverseproxy/templates/configmap.yaml | 4 ++-- .../csireverseproxy/templates/reverseproxy.yaml | 6 +++--- .../csi-powermax/charts/csireverseproxy/values.yaml | 8 +++++--- charts/csi-powermax/templates/controller.yaml | 12 ++++++------ charts/csi-powermax/templates/node.yaml | 8 ++++---- charts/csi-powermax/values.yaml | 8 +++++--- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 7d9cabf2..b5682f9a 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -6,7 +6,7 @@ usage only. {{- /* Use the ConfigMap only if the secretName value is empty or the key is not found */}} -{{- if empty .Values.secretName }} +{{- if or (not (hasKey .Values "secretName")) (empty .Values.secretName) }} apiVersion: v1 kind: ConfigMap metadata: @@ -14,4 +14,4 @@ metadata: namespace: {{ .Release.Namespace }} data: {{ tpl (.Files.Glob "conf/config.yaml").AsConfig . | indent 2 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 364f509c..1ac70f77 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,7 +20,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - {{- $useRevProxySecret := not (empty .Values.secretName) }} + {{- $useRevProxySecret := and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -39,7 +39,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if not (empty .Values.secretName) }} + {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -51,7 +51,7 @@ spec: - name: cert-dir mountPath: /app/certs volumes: - {{- if not (empty .Values.secretName) }} + {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.secretName }} diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index 75c8d0ca..ccd4032f 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -6,7 +6,9 @@ port: 2222 # If this value is modified, then the installation script will have to be modified tlsSecret: "csirevproxy-tls-secret" -# Name of the reverseproxy secret as a Kubernetes resource. -# Default value: "powermax-reverseproxy-secret" +# Name of the reverseproxy secret as a Kubernetes resource, containing +# details required for connecting the csi-powermax driver to Unisphere for +# PowerMax endpoints. +# Default value: "" # Example: "powermax-reverseproxy-secret" -secretName: powermax-reverseproxy-secret +secretName: "" diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index bb23640b..c2c611ed 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,7 +414,7 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller - {{- if empty .Values.csireverseproxy.secretName }} + {{- if or (not (hasKey .Values.csireverseproxy "secretName")) (empty .Values.csireverseproxy.secretName) }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -430,7 +430,7 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - {{- $useRevProxySecret := not (empty .Values.csireverseproxy.secretName) }} + {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -518,7 +518,7 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config - {{- if not (empty .Values.csireverseproxy.secretName) }} + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -529,7 +529,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - {{- $useRevProxySecret := not (empty .Values.csireverseproxy.secretName) }} + {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -548,7 +548,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if not (empty .Values.csireverseproxy.secretName) }} + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -567,7 +567,7 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true - {{- if not (empty .Values.csireverseproxy.secretName) }} + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.csireverseproxy.secretName }} diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index a761d4f8..28ba72f2 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -159,7 +159,7 @@ spec: value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} - {{- if empty .Values.csireverseproxy.secretName }} + {{- if or (not (hasKey .Values.csireverseproxy "secretName")) (empty .Values.csireverseproxy.secretName) }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -176,7 +176,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - {{- $useRevProxySecret := not (empty .Values.csireverseproxy.secretName) }} + {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -293,7 +293,7 @@ spec: mountPath: /node-topology-config {{- end }} {{- end }} - {{- if not (empty .Values.csireverseproxy.secretName) }} + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -489,7 +489,7 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - {{- if not (empty .Values.csireverseproxy.secretName) }} + {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} - name: powermax-reverseproxy-secret secret: secretName: {{ .Values.csireverseproxy.secretName }} diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 331a0ffe..dd30124d 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -338,10 +338,12 @@ csireverseproxy: # Default value: None # Examples: "1111", "8080" port: 2222 - # Name of the reverseproxy secret as a Kubernetes resource. - # Default value: "powermax-reverseproxy-secret" + # Name of the reverseproxy secret as a Kubernetes resource, containing + # details required for connecting the csi-powermax driver to Unisphere for + # PowerMax endpoints. + # Default value: "" # Example: "powermax-reverseproxy-secret" - secretName: powermax-reverseproxy-secret + secretName: "" # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate From 2b7f2def87fd9776ffedb33dfb3913353af5533b Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 21 Jan 2025 13:10:21 -0500 Subject: [PATCH 81/86] refactor use of defaultCredentialsSecret. - remove use of csireverseproxy.secretName in favor of csireverseproxy.useSecret. - if useSecret is set, use defaultCredentialsSecret to specify the reverse proxy secret name. --- .../csireverseproxy/templates/configmap.yaml | 2 +- .../templates/reverseproxy.yaml | 8 +++---- .../charts/csireverseproxy/values.yaml | 15 +++++++----- charts/csi-powermax/templates/controller.yaml | 14 +++++------ charts/csi-powermax/templates/node.yaml | 10 ++++---- charts/csi-powermax/values.yaml | 24 ++++++++++--------- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index b5682f9a..62a36215 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -6,7 +6,7 @@ usage only. {{- /* Use the ConfigMap only if the secretName value is empty or the key is not found */}} -{{- if or (not (hasKey .Values "secretName")) (empty .Values.secretName) }} +{{- if not (.Values.useSecret | default false) }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 1ac70f77..3e87c37c 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,7 +20,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - {{- $useRevProxySecret := and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + {{- $useRevProxySecret := .Values.useSecret | default false }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -39,7 +39,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + {{- if .Values.useSecret | default false }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -51,10 +51,10 @@ spec: - name: cert-dir mountPath: /app/certs volumes: - {{- if and (hasKey .Values "secretName") (not (empty .Values.secretName)) }} + {{- if .Values.useSecret | default false }} - name: powermax-reverseproxy-secret secret: - secretName: {{ .Values.secretName }} + secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} {{- else }} - name: configmap-volume configMap: diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index ccd4032f..863966be 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -6,9 +6,12 @@ port: 2222 # If this value is modified, then the installation script will have to be modified tlsSecret: "csirevproxy-tls-secret" -# Name of the reverseproxy secret as a Kubernetes resource, containing -# details required for connecting the csi-powermax driver to Unisphere for -# PowerMax endpoints. -# Default value: "" -# Example: "powermax-reverseproxy-secret" -secretName: "" +# useSecret +# Defines if the reverseproxy Secret should be used instead of the +# deprecated powermax-reverseproxy-config ConfigMap. If set to true, the contents +# of the secret specified by global.defaultCredentialsSecret will be used, +# in the new format, to specify Unisphere for PowerMax endpoints, array IDs, +# and login credentials. If set to false, the deprecated ConfigMap will be used. +# Default value: true +# Example: false +useSecret: diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index c2c611ed..70258542 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,7 +414,7 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller - {{- if or (not (hasKey .Values.csireverseproxy "secretName")) (empty .Values.csireverseproxy.secretName) }} + {{- if not .Values.csireverseproxy.useSecret }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -430,7 +430,7 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- $useRevProxySecret := .Values.csireverseproxy.useSecret | default false }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -518,7 +518,7 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if .Values.csireverseproxy.useSecret | default false }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -529,7 +529,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- $useRevProxySecret := .Values.csireverseproxy.useSecret | default false }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -548,7 +548,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if .Values.csireverseproxy.useSecret | default false }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -567,10 +567,10 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if .Values.csireverseproxy.useSecret | default false }} - name: powermax-reverseproxy-secret secret: - secretName: {{ .Values.csireverseproxy.secretName }} + secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} {{- else }} - name: configmap-volume configMap: diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 28ba72f2..2e2a0fdd 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -159,7 +159,7 @@ spec: value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} - {{- if or (not (hasKey .Values.csireverseproxy "secretName")) (empty .Values.csireverseproxy.secretName) }} + {{- if not .Values.csireverseproxy.useSecret | default false }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -176,7 +176,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- $useRevProxySecret := .Values.csireverseproxy.useSecret | default false }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -293,7 +293,7 @@ spec: mountPath: /node-topology-config {{- end }} {{- end }} - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if .Values.csireverseproxy.useSecret | default false }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -489,10 +489,10 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - {{- if and (hasKey .Values.csireverseproxy "secretName") (not (empty .Values.csireverseproxy.secretName)) }} + {{- if .Values.csireverseproxy.useSecret | default false }} - name: powermax-reverseproxy-secret secret: - secretName: {{ .Values.csireverseproxy.secretName }} + secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} {{- end }} - name: certs secret: diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index dd30124d..62da7416 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -21,11 +21,10 @@ global: managedArrays: "000000000001,000000000002" # defaultCredentialsSecret - # DEPRECATION NOTICE: The defaultCredentials parameter has been deprecated and will be - # removed in a future release. It remains for backward compatibility only. - # Please see use the parameter .csireverseproxy.secretName below and refer to the official - # documentation website for further details. - defaultCredentialsSecret: powermax-creds + # The name of the Kubernetes Secret containing the details of the PowerMax arrays, + # their Unisphere endpoints and their login credentials. + # Default: "powermax-creds" + defaultCredentialsSecret: "powermax-creds" # portGroups: Define the set of existing port groups that the driver will use. # It is a comma separated list of portgroup names. # Required only in case of iSCSI port groups @@ -338,12 +337,15 @@ csireverseproxy: # Default value: None # Examples: "1111", "8080" port: 2222 - # Name of the reverseproxy secret as a Kubernetes resource, containing - # details required for connecting the csi-powermax driver to Unisphere for - # PowerMax endpoints. - # Default value: "" - # Example: "powermax-reverseproxy-secret" - secretName: "" + # useSecret + # Defines if the reverseproxy Secret should be used instead of the + # deprecated powermax-reverseproxy-config ConfigMap. If set to true, the contents + # of the secret specified by global.defaultCredentialsSecret will be used, + # in the new format, to specify Unisphere for PowerMax endpoints, array IDs, + # and login credentials. If set to false, the deprecated ConfigMap will be used. + # Default value: true + # Example: false + useSecret: true # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate From c60a9e7203659d8302b28619a68ff9f98770c94f Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 21 Jan 2025 13:24:08 -0500 Subject: [PATCH 82/86] update default value for defaultCredsSecret for consistency with operator --- charts/csi-powermax/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 62da7416..0431b1f1 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -23,8 +23,8 @@ global: # defaultCredentialsSecret # The name of the Kubernetes Secret containing the details of the PowerMax arrays, # their Unisphere endpoints and their login credentials. - # Default: "powermax-creds" - defaultCredentialsSecret: "powermax-creds" + # Default: "powermax-config" + defaultCredentialsSecret: "powermax-config" # portGroups: Define the set of existing port groups that the driver will use. # It is a comma separated list of portgroup names. # Required only in case of iSCSI port groups From e151657c172ad938f25ca9ffa201ee438a62b2d1 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 21 Jan 2025 15:53:15 -0500 Subject: [PATCH 83/86] update images in dev to "nightly" --- charts/csi-powermax/charts/csireverseproxy/values.yaml | 2 +- charts/csi-powermax/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index 863966be..b3a19c8a 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -1,4 +1,4 @@ -image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.13.0 +image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:nightly port: 2222 # TLS secret which is used for setting up the proxy HTTPS server diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 0431b1f1..17680adf 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -88,9 +88,9 @@ version: "v2.14.0" images: # "driver" defines the container image, used for the driver container. driver: - image: quay.io/dell/container-storage-modules/csi-powermax:v2.14.0 + image: quay.io/dell/container-storage-modules/csi-powermax:nightly csireverseproxy: - image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.13.0 + image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:nightly # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0 From e71491077240d55f2993d6cf07c93b33fc1375ab Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 21 Jan 2025 16:25:40 -0500 Subject: [PATCH 84/86] PR comments: tdawe - add key validation in case user uses old values version to perform upgrade --- .../charts/csireverseproxy/templates/configmap.yaml | 4 ++-- .../csireverseproxy/templates/reverseproxy.yaml | 6 +++--- charts/csi-powermax/templates/controller.yaml | 12 ++++++------ charts/csi-powermax/templates/node.yaml | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 62a36215..06ed8213 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -4,9 +4,9 @@ be removed in a future release. The ConfigMap remains for backward compatibility usage only. */}} {{- /* -Use the ConfigMap only if the secretName value is empty or the key is not found +Use the ConfigMap only if the useSecret value is empty or the key is not found */}} -{{- if not (.Values.useSecret | default false) }} +{{- if or (not hasKey .Values "useSecret") (empty .Values.useSecret) }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index 3e87c37c..a30ae2e9 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,7 +20,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - {{- $useRevProxySecret := .Values.useSecret | default false }} + {{- $useRevProxySecret := and (hasKey .Values "useSecret") (.Values.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -39,7 +39,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if .Values.useSecret | default false }} + {{- if and (hasKey .Values "useSecret") (.Values.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -51,7 +51,7 @@ spec: - name: cert-dir mountPath: /app/certs volumes: - {{- if .Values.useSecret | default false }} + {{- if and (hasKey .Values "useSecret") (.Values.useSecret | default false) }} - name: powermax-reverseproxy-secret secret: secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 70258542..b30de6e5 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,7 +414,7 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller - {{- if not .Values.csireverseproxy.useSecret }} + {{- if or (not (hasKey .Values.csireverseproxy "useSecret")) (empty .Values.csireverseproxy.useSecret) }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -430,7 +430,7 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - {{- $useRevProxySecret := .Values.csireverseproxy.useSecret | default false }} + {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -518,7 +518,7 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config - {{- if .Values.csireverseproxy.useSecret | default false }} + {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -529,7 +529,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - {{- $useRevProxySecret := .Values.csireverseproxy.useSecret | default false }} + {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -548,7 +548,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if .Values.csireverseproxy.useSecret | default false }} + {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -567,7 +567,7 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true - {{- if .Values.csireverseproxy.useSecret | default false }} + {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: powermax-reverseproxy-secret secret: secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 2e2a0fdd..b4171e35 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -159,7 +159,7 @@ spec: value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} - {{- if not .Values.csireverseproxy.useSecret | default false }} + {{- if or (not (hasKey .Values.csireverseproxy "useSecret")) (empty .Values.csireverseproxy.useSecret) }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -176,7 +176,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - {{- $useRevProxySecret := .Values.csireverseproxy.useSecret | default false }} + {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -293,7 +293,7 @@ spec: mountPath: /node-topology-config {{- end }} {{- end }} - {{- if .Values.csireverseproxy.useSecret | default false }} + {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -489,7 +489,7 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - {{- if .Values.csireverseproxy.useSecret | default false }} + {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} - name: powermax-reverseproxy-secret secret: secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} From fe96d05e97be2ab8a183f024605d81e71a6d7701 Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Tue, 21 Jan 2025 16:40:51 -0500 Subject: [PATCH 85/86] little syntax fix --- .../charts/csireverseproxy/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 06ed8213..2bacd050 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -6,7 +6,7 @@ usage only. {{- /* Use the ConfigMap only if the useSecret value is empty or the key is not found */}} -{{- if or (not hasKey .Values "useSecret") (empty .Values.useSecret) }} +{{- if or (not (hasKey .Values "useSecret")) (empty .Values.useSecret) }} apiVersion: v1 kind: ConfigMap metadata: From 5d6cd166fb9f7281f750f4901b04990c79686dec Mon Sep 17 00:00:00 2001 From: "Lau, Luke" Date: Wed, 22 Jan 2025 11:03:08 -0500 Subject: [PATCH 86/86] PR comments: tdawe, falfaroc - move useSecret to global scope. - set useSecret default to "false" for backward compatibility. --- .../csireverseproxy/templates/configmap.yaml | 2 +- .../templates/reverseproxy.yaml | 6 +++--- .../charts/csireverseproxy/values.yaml | 10 ---------- charts/csi-powermax/templates/controller.yaml | 12 ++++++------ charts/csi-powermax/templates/node.yaml | 8 ++++---- charts/csi-powermax/values.yaml | 18 +++++++++--------- 6 files changed, 23 insertions(+), 33 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml index 2bacd050..f9381380 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml @@ -6,7 +6,7 @@ usage only. {{- /* Use the ConfigMap only if the useSecret value is empty or the key is not found */}} -{{- if or (not (hasKey .Values "useSecret")) (empty .Values.useSecret) }} +{{- if or (not (hasKey .Values.global "useSecret")) (empty .Values.global.useSecret) }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml index a30ae2e9..b1f4d388 100644 --- a/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/templates/reverseproxy.yaml @@ -20,7 +20,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.image }} imagePullPolicy: Always env: - {{- $useRevProxySecret := and (hasKey .Values "useSecret") (.Values.useSecret | default false) }} + {{- $useRevProxySecret := and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -39,7 +39,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if and (hasKey .Values "useSecret") (.Values.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -51,7 +51,7 @@ spec: - name: cert-dir mountPath: /app/certs volumes: - {{- if and (hasKey .Values "useSecret") (.Values.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret secret: secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index b3a19c8a..c6737fbe 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -5,13 +5,3 @@ port: 2222 # Don't change this value unless really necessary # If this value is modified, then the installation script will have to be modified tlsSecret: "csirevproxy-tls-secret" - -# useSecret -# Defines if the reverseproxy Secret should be used instead of the -# deprecated powermax-reverseproxy-config ConfigMap. If set to true, the contents -# of the secret specified by global.defaultCredentialsSecret will be used, -# in the new format, to specify Unisphere for PowerMax endpoints, array IDs, -# and login credentials. If set to false, the deprecated ConfigMap will be used. -# Default value: true -# Example: false -useSecret: diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index b30de6e5..137dc082 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -414,7 +414,7 @@ spec: value: /var/run/csi/csi.sock - name: X_CSI_MODE value: controller - {{- if or (not (hasKey .Values.csireverseproxy "useSecret")) (empty .Values.csireverseproxy.useSecret) }} + {{- if or (not (hasKey .Values.global "useSecret")) (empty .Values.global.useSecret) }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -430,7 +430,7 @@ spec: value: /powermax-config-params/driver-config-params.yaml - name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH value: /powermax-array-config/powermax-array-config.yaml - {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- $useRevProxySecret := and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -518,7 +518,7 @@ spec: mountPath: /powermax-config-params - name: powermax-array-config mountPath: /powermax-array-config - {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -529,7 +529,7 @@ spec: image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- $useRevProxySecret := and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -548,7 +548,7 @@ spec: - name: X_CSI_REVPROXY_WATCH_NAMESPACE value: {{ .Release.Namespace }} volumeMounts: - {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- else }} @@ -567,7 +567,7 @@ spec: secret: secretName: {{ .Release.Name }}-certs optional: true - {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret secret: secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index b4171e35..45b2d8a1 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -159,7 +159,7 @@ spec: value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }} - name: X_CSI_K8S_CLUSTER_PREFIX value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }} - {{- if or (not (hasKey .Values.csireverseproxy "useSecret")) (empty .Values.csireverseproxy.useSecret) }} + {{- if or (not (hasKey .Values.global "useSecret")) (empty .Values.global.useSecret) }} - name: X_CSI_POWERMAX_USER valueFrom: secretKeyRef: @@ -176,7 +176,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - {{- $useRevProxySecret := and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- $useRevProxySecret := and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: X_CSI_REVPROXY_USE_SECRET value: {{ $useRevProxySecret | quote }} {{- if $useRevProxySecret }} @@ -293,7 +293,7 @@ spec: mountPath: /node-topology-config {{- end }} {{- end }} - {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret mountPath: /etc/powermax {{- end }} @@ -489,7 +489,7 @@ spec: - name: powermax-array-config configMap: name: {{ .Release.Name }}-array-config - {{- if and (hasKey .Values.csireverseproxy "useSecret") (.Values.csireverseproxy.useSecret | default false) }} + {{- if and (hasKey .Values.global "useSecret") (.Values.global.useSecret | default false) }} - name: powermax-reverseproxy-secret secret: secretName: {{ required "Must provide defaultCredentialsSecret secret name." .Values.global.defaultCredentialsSecret }} diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 17680adf..bc527711 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -25,6 +25,15 @@ global: # their Unisphere endpoints and their login credentials. # Default: "powermax-config" defaultCredentialsSecret: "powermax-config" + # useSecret + # Defines if a Secret should be used to provide Unisphere for PowerMax endpoints + # and login credentials instead of the deprecated powermax-reverseproxy-config ConfigMap. + # If set to true, the contents of the secret specified by defaultCredentialsSecret + # will be used, in the new format, to specify Unisphere for PowerMax endpoints, array IDs, + # and login credentials. If set to false, the deprecated ConfigMap will be automatically + # created and used. + # Default value: false + useSecret: false # portGroups: Define the set of existing port groups that the driver will use. # It is a comma separated list of portgroup names. # Required only in case of iSCSI port groups @@ -337,15 +346,6 @@ csireverseproxy: # Default value: None # Examples: "1111", "8080" port: 2222 - # useSecret - # Defines if the reverseproxy Secret should be used instead of the - # deprecated powermax-reverseproxy-config ConfigMap. If set to true, the contents - # of the secret specified by global.defaultCredentialsSecret will be used, - # in the new format, to specify Unisphere for PowerMax endpoints, array IDs, - # and login credentials. If set to false, the deprecated ConfigMap will be used. - # Default value: true - # Example: false - useSecret: true # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate