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.
dell · Jan 17, 2025 · f69fdae · f69fdae
1 parent d92583a
commit f69fdae
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml b/charts/csi-powermax/charts/csireverseproxy/templates/configmap.yaml
@@ -6,12 +6,12 @@ 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:
   name: {{ .Release.Name }}-reverseproxy-config
   namespace: {{ .Release.Namespace }}
 data:
 {{ tpl (.Files.Glob "conf/config.yaml").AsConfig . | indent 2 }}
-{{- end }}
+{{- end }}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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