From 703a3fc4f87eb6a510c7b381c4383da45ad22999 Mon Sep 17 00:00:00 2001
From: Travis Raines <571832+rainest@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:31:58 -0800
Subject: [PATCH] fix(env) add missing envFrom render

---
 charts/kong/CHANGELOG.md              | 9 +++++++++
 charts/kong/Chart.yaml                | 2 +-
 charts/kong/templates/deployment.yaml | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index 86643d87e..60e58106d 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -2,12 +2,21 @@
 
 ## Unreleased
 
+Nothing yet.
+
+## 2.35.0
+
 ### Added 
 
 * Added controller's RBAC rules for `KongVault` CRD (installed only when KIC
   version >= 3.1.0).
   [#992](https://github.com/Kong/charts/pull/992)
 
+### Fixed
+
+* Added a missing `envFrom` render in the main Kong proxy container.
+  [#994](https://github.com/Kong/charts/pull/994)
+
 ## 2.34.0
 
 ### Added
diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
index 99af18cc6..77312ff95 100644
--- a/charts/kong/Chart.yaml
+++ b/charts/kong/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 name: kong
 sources:
   - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.34.0
+version: 2.34.1
 appVersion: "3.5"
 dependencies:
   - name: postgresql
diff --git a/charts/kong/templates/deployment.yaml b/charts/kong/templates/deployment.yaml
index 70da44590..6e9bba8d3 100644
--- a/charts/kong/templates/deployment.yaml
+++ b/charts/kong/templates/deployment.yaml
@@ -137,6 +137,7 @@ spec:
         {{ toYaml .Values.containerSecurityContext | nindent 10 }}
         env:
         {{- include "kong.no_daemon_env" . | nindent 8 }}
+        {{- include "kong.envFrom" .Values.envFrom | nindent 8 }}
         lifecycle:
           {{- toYaml .Values.lifecycle | nindent 10 }}
         ports: