diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 7d1108f8..0312b358 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.4.1 +version: 7.5.0 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ @@ -34,8 +34,8 @@ maintainers: kubeVersion: ">=1.9.0-0" annotations: artifacthub.io/changes: | - - kind: changed - description: Fix link in readme to existingSecret needed fields + - kind: added + description: Add proxyVarsFromSecret: "" option links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/193 + url: https://github.com/oauth2-proxy/manifests/pull/141 diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index 218bef44..9e878c8e 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -164,6 +164,11 @@ spec: name: {{ template "oauth2-proxy.secretName" . }} key: cookie-secret {{- end }} + {{- with .Values.proxyVarsFromSecret }} + envFrom: + - secretRef: + name: {{ . }} + {{- end }} {{- if eq (default "cookie" .Values.sessionStorage.type) "redis" }} - name: OAUTH2_PROXY_SESSION_STORE_TYPE value: "redis" diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml index 219f45ad..d331438a 100644 --- a/helm/oauth2-proxy/values.yaml +++ b/helm/oauth2-proxy/values.yaml @@ -221,6 +221,9 @@ nodeSelector: {} # Whether to use secrets instead of environment values for setting up OAUTH2_PROXY variables proxyVarsAsSecrets: true +# Allows to import environment values for OAUTH2_PROXY directly from a secret +proxyVarsFromSecret: "" + # Configure Kubernetes liveness and readiness probes. # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/ # Disable both when deploying with Istio 1.0 mTLS. https://istio.io/help/faq/security/#k8s-health-checks