From 1dcf5111d1da5419faaa26df468406a2af34e7b6 Mon Sep 17 00:00:00 2001
From: Andy Suderman <andy@fairwinds.com>
Date: Fri, 8 Dec 2023 11:09:04 -0700
Subject: [PATCH] [stable/vpa] Add the ability to specify an envFrom secret
 (#1386)

---
 stable/vpa/Chart.yaml                            | 2 +-
 stable/vpa/README.md                             | 1 +
 stable/vpa/templates/recommender-deployment.yaml | 5 +++++
 stable/vpa/values.yaml                           | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/stable/vpa/Chart.yaml b/stable/vpa/Chart.yaml
index 17073ad33..d2692e249 100644
--- a/stable/vpa/Chart.yaml
+++ b/stable/vpa/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: vpa
 description: A Helm chart for Kubernetes Vertical Pod Autoscaler
 type: application
-version: 3.0.2
+version: 3.1.0
 appVersion: 0.14.0
 maintainers:
   - name: sudermanjr
diff --git a/stable/vpa/README.md b/stable/vpa/README.md
index 0d25fb281..2da4d8c2c 100644
--- a/stable/vpa/README.md
+++ b/stable/vpa/README.md
@@ -146,6 +146,7 @@ recommender:
 | serviceAccount.name | string | `""` | The base name of the service account to use (appended with the component). If not set and create is true, a name is generated using the fullname template and appended for each component |
 | serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
 | recommender.enabled | bool | `true` | If true, the vpa recommender component will be installed. |
+| recommender.envFromSecret | string | `""` | Specify a secret to get environment variables from |
 | recommender.annotations | object | `{}` | Annotations to add to the recommender deployment |
 | recommender.extraArgs | object | `{"pod-recommendation-min-cpu-millicores":15,"pod-recommendation-min-memory-mb":100,"v":"4"}` | A set of key-value flags to be passed to the recommender |
 | recommender.replicaCount | int | `1` |  |
diff --git a/stable/vpa/templates/recommender-deployment.yaml b/stable/vpa/templates/recommender-deployment.yaml
index 9ac23c594..02b5c603c 100644
--- a/stable/vpa/templates/recommender-deployment.yaml
+++ b/stable/vpa/templates/recommender-deployment.yaml
@@ -66,6 +66,11 @@ spec:
             - name: metrics
               containerPort: 8942
               protocol: TCP
+          {{- if .Values.recommender.envFromSecret }}
+          envFrom:
+          - secretRef:
+              name: {{ .Values.recommender.envFromSecret }}
+          {{- end }}
           resources:
             {{- toYaml .Values.recommender.resources | nindent 12 }}
       {{- with .Values.recommender.nodeSelector }}
diff --git a/stable/vpa/values.yaml b/stable/vpa/values.yaml
index a1293a59a..3172434c3 100644
--- a/stable/vpa/values.yaml
+++ b/stable/vpa/values.yaml
@@ -44,6 +44,8 @@ serviceAccount:
 recommender:
   # recommender.enabled -- If true, the vpa recommender component will be installed.
   enabled: true
+  # -- Specify a secret to get environment variables from
+  envFromSecret: ""
   # recommender.annotations -- Annotations to add to the recommender deployment
   annotations: {}
   # recommender.extraArgs -- A set of key-value flags to be passed to the recommender