From dd7bb719658493494fd5f5af6d79e0d0a0cba583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= <czeslavo@gmail.com>
Date: Mon, 17 Jun 2024 17:20:43 +0200
Subject: [PATCH] fix: adapt to kong chart v2.39 (#1105)

---
 CHANGELOG.md                      | 6 +++++-
 pkg/clusters/addons/kong/addon.go | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2d3340e..90c31d7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## Unreleased
+## v0.47.1
+
+- Adapt Kong addon to the `kong/kong` Helm chart v2.39.0 that requires
+  `enterprise.rbac.session_conf_secret` to be explicitly defined.
+  [#1105](https://github.com/Kong/kubernetes-testing-framework/pull/1105)
 
 ## v0.47.0
 
diff --git a/pkg/clusters/addons/kong/addon.go b/pkg/clusters/addons/kong/addon.go
index c5564aab..3ab29159 100644
--- a/pkg/clusters/addons/kong/addon.go
+++ b/pkg/clusters/addons/kong/addon.go
@@ -360,6 +360,9 @@ func (a *Addon) Deploy(ctx context.Context, cluster clusters.Cluster) error {
 			}
 		}
 
+		// Set the session configuration secret name for the admin GUI.
+		a.deployArgs = append(a.deployArgs, "--set", fmt.Sprintf("enterprise.rbac.session_conf_secret=%s", DefaultAdminGUISessionConfSecretName))
+
 		// Deploy the admin session configuration needed for enterprise enabled mode.
 		if err := deployKongEnterpriseAdminGUISessionConf(ctx, cluster, a.namespace); err != nil {
 			return err