Skip to content

Commit

Permalink
Merge pull request #152 from mkjpryor/feature/alpha-config-template
Browse files Browse the repository at this point in the history
Allow alpha config to come from a template
  • Loading branch information
pierluigilenoci authored Jun 7, 2023
2 parents a66a1f9 + 9ab7aa5 commit 518dc3c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion helm/oauth2-proxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: oauth2-proxy
version: 6.12.1
version: 6.13.0
apiVersion: v2
appVersion: 7.4.0
home: https://oauth2-proxy.github.io/oauth2-proxy/
Expand Down
1 change: 1 addition & 0 deletions helm/oauth2-proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `""`
Expand Down
3 changes: 3 additions & 0 deletions helm/oauth2-proxy/templates/configmap-alpha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
3 changes: 3 additions & 0 deletions helm/oauth2-proxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ~

Expand Down

0 comments on commit 518dc3c

Please sign in to comment.