Merge branch 'main' into fix/allow-literal-zero-values

oauth2-proxy · Jun 7, 2023 · 73a1f1a · 73a1f1a
2 parents fd0de2d + 518dc3c
commit 73a1f1a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.12.2
+version: 6.13.1
 apiVersion: v2
 appVersion: 7.4.0
 home: https://oauth2-proxy.github.io/oauth2-proxy/

diff --git a/helm/oauth2-proxy/README.md b/helm/oauth2-proxy/README.md
@@ -107,6 +107,7 @@ Parameter | Description | Default
 `alphaConfig.serverConfigData` | Arbitrary configuration data to append to the server section | `{}`
 `alphaConfig.metricsConfigData` | Arbitrary configuration data to append to the metrics section | `{}`
 `alphaConfig.configData` | Arbitrary configuration data to append | `{}`
+`alphaConfig.configFile` | Arbitrary configuration to append, treated as a Go template and rendered with the root context | `""`
 `alphaConfig.existingConfig` | existing Kubernetes configmap to use for the alpha configuration file. See [config template](https://github.com/oauth2-proxy/manifests/blob/master/helm/oauth2-proxy/templates/configmap-alpha.yaml) for the required values | `nil`
 `customLabels` | Custom labels to add into metadata | `{}` |
 `config.google.adminEmail` | user impersonated by the google service account | `""`

diff --git a/helm/oauth2-proxy/templates/configmap-alpha.yaml b/helm/oauth2-proxy/templates/configmap-alpha.yaml
@@ -29,5 +29,8 @@ data:
     {{- if .Values.alphaConfig.configData }}
     {{- toYaml .Values.alphaConfig.configData | nindent 4 }}
     {{- end }}
+    {{- if .Values.alphaConfig.configFile }}
+    {{- tpl .Values.alphaConfig.configFile $ | nindent 4 }}
+    {{- end }}
 {{- end }}
 {{- end }}
diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml
@@ -58,6 +58,9 @@ alphaConfig:
   metricsConfigData: {}
   # Arbitrary configuration data to append
   configData: {}
+  # Arbitrary configuration to append
+  # This is treated as a Go template and rendered with the root context
+  configFile: ""
   # Use an existing config map (see configmap-alpha.yaml for required fields)
   existingConfig: ~