consolidate secret file path to a single env var

dell · Jan 17, 2025 · 6b78f99 · 6b78f99
1 parent 39af22e
commit 6b78f99
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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