From f4246a8b13b9b32b86f368e26ca48e9a37059690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= <czeslavo@gmail.com>
Date: Fri, 8 Dec 2023 00:42:13 +0100
Subject: [PATCH] fix(controller): use the renamed API group for incubator
 package (#968)

Aligns the API group name for KongServiceFacade RBAC rules so it matches after
the rename Kong/kubernetes-ingress-controller#5302. Releases a kong/kong 2.33.1 patch.
---
 charts/kong/CHANGELOG.md           | 9 +++++++++
 charts/kong/Chart.yaml             | 2 +-
 charts/kong/templates/_helpers.tpl | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index a47ce6464..5f87c1581 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.33.1
+
+### Fixed
+
+* Use changed `incubator.ingress-controller.konghq.com` API group name in `KongServiceFacade`
+  RBAC rules. Refer to [KIC#5302](https://github.com/Kong/kubernetes-ingress-controller/pull/5302)
+  for rename reasoning.
+  [#968](https://github.com/Kong/charts/pull/968)
+
 ## 2.33.0
 
 ### Improvements
diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
index db7c31596..77250613a 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.33.0
+version: 2.33.1
 appVersion: "3.5"
 dependencies:
   - name: postgresql
diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl
index 5ff57d67d..c097636b1 100644
--- a/charts/kong/templates/_helpers.tpl
+++ b/charts/kong/templates/_helpers.tpl
@@ -1266,7 +1266,7 @@ resource roles into their separate templates.
 {{- if and (semverCompare ">= 3.1.0" (include "kong.effectiveVersion" .Values.ingressController.image))
            (contains (print .Values.ingressController.env.feature_gates) "KongServiceFacade=true") }}
 - apiGroups:
-  - incubator.konghq.com
+  - incubator.ingress-controller.konghq.com
   resources:
   - kongservicefacades
   verbs:
@@ -1274,7 +1274,7 @@ resource roles into their separate templates.
   - list
   - watch
 - apiGroups:
-  - incubator.konghq.com
+  - incubator.ingress-controller.konghq.com
   resources:
   - kongservicefacades/status
   verbs: