From 44fbca1fb807e995cce77e22995f96c270ea1ebf Mon Sep 17 00:00:00 2001
From: dza89 <dhapotter@gmail.com>
Date: Sat, 5 Dec 2020 15:50:30 +0100
Subject: [PATCH] [traefik-forward-auth] Add envFrom option (#304)

---
 charts/traefik-forward-auth/Chart.yaml                | 2 +-
 charts/traefik-forward-auth/README.md                 | 1 +
 charts/traefik-forward-auth/templates/deployment.yaml | 4 ++++
 charts/traefik-forward-auth/values.yaml               | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/traefik-forward-auth/Chart.yaml b/charts/traefik-forward-auth/Chart.yaml
index 0abd3e69..932e8e85 100644
--- a/charts/traefik-forward-auth/Chart.yaml
+++ b/charts/traefik-forward-auth/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: traefik-forward-auth
 description: A minimal forward authentication service that provides OAuth/SSO login and authentication for the traefik reverse proxy/load balancer
 type: application
-version: 1.0.3
+version: 1.0.4
 appVersion: 2.2.0
 keywords:
   - traefik
diff --git a/charts/traefik-forward-auth/README.md b/charts/traefik-forward-auth/README.md
index 4cf33483..d8ecafcd 100644
--- a/charts/traefik-forward-auth/README.md
+++ b/charts/traefik-forward-auth/README.md
@@ -65,6 +65,7 @@ helm install traefik-forward-auth k8s-at-home/traefik-forward-auth --values valu
 | default.action | string | `""` | [auth|allow] Default action (default: auth) |
 | default.provider | string | `""` | [google|oidc|generic-oauth] Default provider (default: google) |
 | env | list | `[]` |  |
+| envFrom | list | `[]` | Load environment variables from secrets or configmaps |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"thomseddon/traefik-forward-auth"` |  |
diff --git a/charts/traefik-forward-auth/templates/deployment.yaml b/charts/traefik-forward-auth/templates/deployment.yaml
index d3cf9566..99635418 100644
--- a/charts/traefik-forward-auth/templates/deployment.yaml
+++ b/charts/traefik-forward-auth/templates/deployment.yaml
@@ -38,6 +38,10 @@ spec:
           {{- end }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.envFrom }}
+          envFrom:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
           env:
             {{- if .Values.logging.level }}
             - name: LOG_LEVEL
diff --git a/charts/traefik-forward-auth/values.yaml b/charts/traefik-forward-auth/values.yaml
index 157ebefb..476e5f4d 100644
--- a/charts/traefik-forward-auth/values.yaml
+++ b/charts/traefik-forward-auth/values.yaml
@@ -96,6 +96,9 @@ providers:
     resource: ""
 
 env: []
+envFrom:
+# - secretRef:
+#     name:
 
 serviceAccount:
   # Specifies whether a service account should be created