Skip to content

Commit ec56488

Browse files
Merge pull request #201 from StianOvrevage/feat/add-envfrom
Add option to add config via envFrom
2 parents ed65764 + fc2b48d commit ec56488

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

helm/oauth2-proxy/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: oauth2-proxy
2-
version: 7.5.1
2+
version: 7.5.2
33
apiVersion: v2
44
appVersion: 7.6.0
55
home: https://oauth2-proxy.github.io/oauth2-proxy/
@@ -35,7 +35,7 @@ kubeVersion: ">=1.9.0-0"
3535
annotations:
3636
artifacthub.io/changes: |
3737
- kind: changed
38-
description: Fix indentation in ServiceMonitor tlsConfig
38+
description: Support envFrom as way to configure Pod
3939
links:
4040
- name: Github PR
41-
url: https://github.com/oauth2-proxy/manifests/pull/200
41+
url: https://github.com/oauth2-proxy/manifests/issues/198

helm/oauth2-proxy/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@ spec:
222222
{{- end }}
223223
{{- if .Values.extraEnv }}
224224
{{ tpl (toYaml .Values.extraEnv) . | indent 8 }}
225+
{{- end }}
226+
{{- if .Values.envFrom }}
227+
envFrom:
228+
{{ tpl (toYaml .Values.envFrom) . | indent 8 }}
225229
{{- end }}
226230
ports:
227231
{{- if .Values.containerPort }}

helm/oauth2-proxy/values.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,19 @@ image:
8686
extraArgs: {}
8787
extraEnv: []
8888

89+
envFrom: []
90+
# Load environment variables from a ConfigMap(s) and/or Secret(s)
91+
# that already exists (created and managed by you).
92+
# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables
93+
#
94+
# PS: Changes in these ConfigMaps or Secrets will not be automatically
95+
# detected and you must manually restart the relevant Pods after changes.
96+
#
97+
# - configMapRef:
98+
# name: special-config
99+
# - secretRef:
100+
# name: special-config-secret
101+
89102
# -- Custom labels to add into metadata
90103
customLabels: {}
91104

0 commit comments

Comments
 (0)