From b462330d7cc30f05e822f95c340370e407d5b62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= <czeslavo@gmail.com>
Date: Tue, 5 Dec 2023 19:14:22 +0100
Subject: [PATCH] feat: add KongServiceFacade RBACs, release charts

---
 charts/ingress/CHANGELOG.md        |  5 +++++
 charts/ingress/Chart.lock          | 12 ++++++------
 charts/ingress/Chart.yaml          | 10 +++++-----
 charts/kong/CHANGELOG.md           |  5 ++++-
 charts/kong/Chart.yaml             |  2 +-
 charts/kong/templates/_helpers.tpl | 19 +++++++++++++++++++
 6 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/charts/ingress/CHANGELOG.md b/charts/ingress/CHANGELOG.md
index c4b7632cf..46ce1dd84 100644
--- a/charts/ingress/CHANGELOG.md
+++ b/charts/ingress/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.10.0
+
+- Bumped dependencies on `kong/kong` chart to `>=2.33.0`.
+  [#963](https://github.com/Kong/charts/pull/963)
+
 ## 0.9.0
 
 ### Improvements
diff --git a/charts/ingress/Chart.lock b/charts/ingress/Chart.lock
index 37828408e..c33c50eb1 100644
--- a/charts/ingress/Chart.lock
+++ b/charts/ingress/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: kong
-  repository: https://charts.konghq.com
-  version: 2.31.0
+  repository: file://../kong
+  version: 2.33.0
 - name: kong
-  repository: https://charts.konghq.com
-  version: 2.31.0
-digest: sha256:2897c91fb6e37c04f99a413dac85f991fed223591b8de327a04795e27b90a617
-generated: "2023-11-06T14:36:11.845865+01:00"
+  repository: file://../kong
+  version: 2.33.0
+digest: sha256:f9ea112f7fc570942344c11dfa69df41aad5bf85badf858b8bf69ded9eca379b
+generated: "2023-12-06T10:55:40.833004+01:00"
diff --git a/charts/ingress/Chart.yaml b/charts/ingress/Chart.yaml
index 38e09d233..3e995f599 100644
--- a/charts/ingress/Chart.yaml
+++ b/charts/ingress/Chart.yaml
@@ -8,16 +8,16 @@ maintainers:
 name: ingress
 sources:
   - https://github.com/Kong/charts/tree/main/charts/ingress
-version: 0.9.0
+version: 0.10.0
 appVersion: "3.4"
 dependencies:
   - name: kong
-    version: ">=2.31.0"
-    repository: https://charts.konghq.com
+    version: ">=2.33.0"
+    repository: file://../kong
     alias: controller
     condition: controller.enabled
   - name: kong
-    version: ">=2.31.0"
-    repository: https://charts.konghq.com
+    version: ">=2.33.0"
+    repository: file://../kong
     alias: gateway
     condition: gateway.enabled
diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index 77cc1932f..03f166185 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 2.33.0
 
 ### Improvements
 
@@ -11,6 +11,9 @@
 * Validate Gateway API's `Gateway` and `HTTPRoute` resources in the controller's
   admission webhook only when KIC version is 3.0 or higher.
   [#954](https://github.com/Kong/charts/pull/954)
+* Added controller's RBAC rules for `KongServiceFacade` CRD (installed only when
+  KongServiceFacade feature gate turned on and KIC version >= 3.1.0).
+  [#963](https://github.com/Kong/charts/pull/963)
 
 ## 2.32.0
 
diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
index 2839fbd47..db7c31596 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.32.0
+version: 2.33.0
 appVersion: "3.5"
 dependencies:
   - name: postgresql
diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl
index bd2f83d5f..a84f0609e 100644
--- a/charts/kong/templates/_helpers.tpl
+++ b/charts/kong/templates/_helpers.tpl
@@ -1261,6 +1261,25 @@ role sets used in the charts. Updating these requires separating out cluster
 resource roles into their separate templates.
 */}}
 {{- define "kong.kubernetesRBACRules" -}}
+{{- if and (semverCompare ">= 3.1.0" (include "kong.effectiveVersion" .Values.ingressController.image))
+           (and (not empty .Values.ingressController.env.feature_gates) (contains .Values.ingressController.env.feature_gates "KongServiceFacade=true")) }}
+- apiGroups:
+  - incubator.konghq.com
+  resources:
+  - kongservicefacades
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - incubator.konghq.com
+  resources:
+  - kongservicefacades/status
+  verbs:
+  - get
+  - patch
+  - update
+{{- end }}
 {{- if (semverCompare ">= 3.0.0" (include "kong.effectiveVersion" .Values.ingressController.image)) }}
 - apiGroups:
   - configuration.konghq.com