Skip to content

Commit

Permalink
Merge pull request #201 from StianOvrevage/feat/add-envfrom
Browse files Browse the repository at this point in the history
Add option to add config via envFrom
  • Loading branch information
pierluigilenoci authored Apr 30, 2024
2 parents ed65764 + fc2b48d commit ec56488
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
6 changes: 3 additions & 3 deletions helm/oauth2-proxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: oauth2-proxy
version: 7.5.1
version: 7.5.2
apiVersion: v2
appVersion: 7.6.0
home: https://oauth2-proxy.github.io/oauth2-proxy/
Expand Down Expand Up @@ -35,7 +35,7 @@ kubeVersion: ">=1.9.0-0"
annotations:
artifacthub.io/changes: |
- kind: changed
description: Fix indentation in ServiceMonitor tlsConfig
description: Support envFrom as way to configure Pod
links:
- name: Github PR
url: https://github.com/oauth2-proxy/manifests/pull/200
url: https://github.com/oauth2-proxy/manifests/issues/198
4 changes: 4 additions & 0 deletions helm/oauth2-proxy/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ spec:
{{- end }}
{{- if .Values.extraEnv }}
{{ tpl (toYaml .Values.extraEnv) . | indent 8 }}
{{- end }}
{{- if .Values.envFrom }}
envFrom:
{{ tpl (toYaml .Values.envFrom) . | indent 8 }}
{{- end }}
ports:
{{- if .Values.containerPort }}
Expand Down
13 changes: 13 additions & 0 deletions helm/oauth2-proxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,19 @@ image:
extraArgs: {}
extraEnv: []

envFrom: []
# Load environment variables from a ConfigMap(s) and/or Secret(s)
# that already exists (created and managed by you).
# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables
#
# PS: Changes in these ConfigMaps or Secrets will not be automatically
# detected and you must manually restart the relevant Pods after changes.
#
# - configMapRef:
# name: special-config
# - secretRef:
# name: special-config-secret

# -- Custom labels to add into metadata
customLabels: {}

Expand Down

0 comments on commit ec56488

Please sign in to comment.