rename proxyVarsFromSecret to envFromExistingSecret

Author: tuunit

helm/oauth2-proxy/templates/deployment.yaml

@@ -172,13 +172,13 @@ spec:
         lifecycle:
 {{ toYaml .Values.lifecycle | indent 10 }}
 {{- end }}
-        {{- with .Values.proxyVarsFromSecret }}
+        {{- with .Values.envFromExistingSecret }}
         envFrom:
         - secretRef:
-            name: {{  . }}
+            name: {{ . }}
         {{- end }}
         env:
-        {{- if .Values.proxyVarsAsSecrets }}
+        {{- if and (not .Values.envFromExistingSecret) .Values.proxyVarsAsSecrets }}
         - name: OAUTH2_PROXY_CLIENT_ID
           valueFrom:
             secretKeyRef:
@@ -242,7 +242,7 @@ spec:
         {{- if .Values.extraEnv }}
 {{ tpl (toYaml .Values.extraEnv) . | indent 8 }}
         {{- end }}
-        {{- if .Values.envFrom }}
+        {{- if and (not .Values.envFromExistingSecret) .Values.envFrom }}
         envFrom:
 {{ tpl (toYaml .Values.envFrom) . | indent 8 }}
         {{- end }}

helm/oauth2-proxy/values.yaml

@@ -107,6 +107,13 @@ envFrom: []
 #  - secretRef:
 #      name: special-config-secret
 
+# Import all environment variables from an existing secret. Will overwrite 'proxyVarsAsSecrets' and 'envFrom'.
+envFromExistingSecret: ""
+
+# Whether to create a secret instead of plain environment values for configuring
+# the client_id, client_secret and cookie_secret
+proxyVarsAsSecrets: true
+
 # -- Custom labels to add into metadata
 customLabels: {}
 
@@ -245,12 +252,6 @@ tolerations: []
 # Ref: https://kubernetes.io/docs/user-guide/node-selection/
 nodeSelector: {}
 
-# Whether to use secrets instead of environment values for setting up OAUTH2_PROXY variables
-proxyVarsAsSecrets: true
-
-# Import all environment variables from an existing secret. Not compatible with 'proxyVarsAsSecrets'.
-# proxyVarsFromSecret: my-secret-name
-
 # Configure Kubernetes liveness and readiness probes.
 # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
 # Disable both when deploying with Istio 1.0 mTLS. https://istio.io/help/faq/security/#k8s-health-checks