Pass oauth2-proxy config through helm templating (#132)

Signed-off-by: Jan-Otto Kröpke <[email protected]>

Author: jkroepke

helm/oauth2-proxy/Chart.yaml

@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.8.0
+version: 6.9.0
 apiVersion: v2
 appVersion: 7.4.0
 home: https://oauth2-proxy.github.io/oauth2-proxy/

helm/oauth2-proxy/ci/tpl-values.yaml

@@ -0,0 +1,21 @@
+extraEnv:
+  - name: TEST_ENV_VAR_2
+    value: '{{ $.Release.Name }}'
+ingress:
+  enabled: true
+  hosts:
+    - "{{ $.Release.Name }}.local"
+  tls:
+    - hosts:
+        - "{{ $.Release.Name }}.local"
+oauth2-proxy:
+  checkDeprecation: false
+  config:
+    clientSecret: '{{ $.Release.Name }}'
+    configFile: |
+      oidc_issuer_url = "https://{{ $.Release.Name }}/dex"
+
+pass_authorization_header: "true"
+
+extraArgs:
+  pass-authorization-header: "{{ $.Values.pass_authorization_header }}"

helm/oauth2-proxy/templates/configmap.yaml

@@ -12,6 +12,6 @@ metadata:
 {{- include "oauth2-proxy.labels" . | indent 4 }}
   name: {{ template "oauth2-proxy.fullname" . }}
 data:
-  oauth2_proxy.cfg: {{ .Values.config.configFile | quote }}
+  oauth2_proxy.cfg: {{ tpl .Values.config.configFile $ | quote }}
 {{- end }}
 {{- end }}

helm/oauth2-proxy/templates/deployment.yaml

@@ -73,7 +73,7 @@ spec:
         {{- if kindIs "map" .Values.extraArgs }}
           {{- range $key, $value := .Values.extraArgs }}
           {{- if $value }}
-          - --{{ $key }}={{ $value }}
+          - --{{ $key }}={{ tpl $value $ }}
           {{- else }}
           - --{{ $key }}
           {{- end }}

helm/oauth2-proxy/templates/ingress.yaml

@@ -21,7 +21,7 @@ spec:
   {{- end }}
   rules:
     {{- range $host := .Values.ingress.hosts }}
-    - host: {{ $host | quote }}
+    - host: {{ tpl $host $ | quote }}
       http:
         paths:
 {{- if $extraPaths }}
@@ -35,6 +35,6 @@ spec:
     {{- end -}}
   {{- if .Values.ingress.tls }}
   tls:
-{{ toYaml .Values.ingress.tls | indent 4 }}
+{{ tpl (toYaml .Values.ingress.tls) $ | indent 4 }}
   {{- end -}}
 {{- end -}}

helm/oauth2-proxy/templates/secret.yaml

@@ -12,7 +12,7 @@ metadata:
   name: {{ template "oauth2-proxy.fullname" . }}
 type: Opaque
 data:
-  cookie-secret: {{ .Values.config.cookieSecret | b64enc | quote }}
-  client-secret: {{ .Values.config.clientSecret | b64enc | quote }}
-  client-id: {{ .Values.config.clientID | b64enc | quote }}
+  cookie-secret: {{ tpl .Values.config.cookieSecret $ | b64enc | quote }}
+  client-secret: {{ tpl .Values.config.clientSecret $ | b64enc | quote }}
+  client-id: {{ tpl .Values.config.clientID $ | b64enc | quote }}
 {{- end -}}