From 6060cbcd14127b99df9fde283603fcc385f16ccc Mon Sep 17 00:00:00 2001
From: Matthias Vach <matthias.vach@sap.com>
Date: Fri, 23 Jan 2026 14:13:05 +0100
Subject: [PATCH 1/2] Repository request for rfc-0049-cf-on-kind of pr #1389

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>
---
 orgs/branchprotection.yml                     | 35 +++++++++++++++++++
 orgs/orgs.yml                                 |  8 +++++
 toc/working-groups/app-runtime-deployments.md | 18 ++++++++++
 3 files changed, 61 insertions(+)

diff --git a/orgs/branchprotection.yml b/orgs/branchprotection.yml
index 395aa326a..925e81128 100644
--- a/orgs/branchprotection.yml
+++ b/orgs/branchprotection.yml
@@ -175,6 +175,41 @@ branch-protection:
               teams: ["wg-app-runtime-platform-bots"]
 
         # CF-on-K8s
+        k8s-garden-client:
+          allow_deletions: false
+          allow_disabled_policies: true
+          allow_force_pushes: false
+          enforce_admins: true
+          include: ["^main$"]
+          protect: true
+          required_status_checks:
+            contexts:
+              - "unit"
+              - "EasyCLA"
+          required_pull_request_reviews:
+            bypass_pull_request_allowances:
+              teams: ["wg-app-runtime-platform-bots"]
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1
+        kind-deployment:
+          allow_deletions: false
+          allow_disabled_policies: true
+          allow_force_pushes: false
+          enforce_admins: true
+          include: ["^main$"]
+          protect: true
+          required_status_checks:
+            contexts:
+              - "unit"
+              - "EasyCLA"
+          required_pull_request_reviews:
+            bypass_pull_request_allowances:
+              teams: ["wg-app-runtime-platform-bots"]
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1
+
         korifi-ci:
           protect: false
         cf-k8s-secrets:
diff --git a/orgs/orgs.yml b/orgs/orgs.yml
index 7a4f3200a..de4a334ec 100644
--- a/orgs/orgs.yml
+++ b/orgs/orgs.yml
@@ -1676,6 +1676,14 @@ orgs:
         description: Terminate the JVM when resources are exhausted
         has_projects: true
         has_wiki: false
+      k8s-garden-client:
+        description: Garden client implementation for Kubernetes
+        has_projects: false
+        has_wiki: false
+      kind-deployment:
+        description: Deploying Cloud Foundry on a local kind cluster
+        has_projects: false
+        has_wiki: false
       korifi:
         default_branch: main
         description: Cloud Foundry on Kubernetes
diff --git a/toc/working-groups/app-runtime-deployments.md b/toc/working-groups/app-runtime-deployments.md
index 138e25492..ca88a38fa 100644
--- a/toc/working-groups/app-runtime-deployments.md
+++ b/toc/working-groups/app-runtime-deployments.md
@@ -83,4 +83,22 @@ areas:
   - cloudfoundry/relint-team
   - cloudfoundry/runtime-ci
   - cloudfoundry/uptimer
+- name: Kind Deployment
+  reviewers: []
+  approvers:
+  - name: Jan von Löwenstein
+    github: loewenstein-sap
+  - name: Pavel Busko
+    github: pbusko
+  - name: Johannes Dillmann
+    github: modulo11
+  - name: Ralf Pannemans
+    github: c0d1ngm0nk3y
+  - name: Nicolas Bender
+    github: nicolasbender
+  - name: Matthias Vach
+    github: mvach
+  repositories:
+  - cloudfoundry/k8s-garden-client
+  - cloudfoundry/kind-deployment
 ```

From 75aceecd92b9c8e6859417fe70a3c9870fc85ef0 Mon Sep 17 00:00:00 2001
From: Matthias Vach <matthias.vach@sap.com>
Date: Fri, 23 Jan 2026 14:48:47 +0100
Subject: [PATCH 2/2] update used bot

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>
---
 orgs/branchprotection.yml                     | 4 ++--
 toc/working-groups/app-runtime-deployments.md | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/orgs/branchprotection.yml b/orgs/branchprotection.yml
index 925e81128..8fe5673f8 100644
--- a/orgs/branchprotection.yml
+++ b/orgs/branchprotection.yml
@@ -188,7 +188,7 @@ branch-protection:
               - "EasyCLA"
           required_pull_request_reviews:
             bypass_pull_request_allowances:
-              teams: ["wg-app-runtime-platform-bots"]
+              teams: ["ard-wg-k8s-gitbot"]
             dismiss_stale_reviews: true
             require_code_owner_reviews: true
             required_approving_review_count: 1
@@ -205,7 +205,7 @@ branch-protection:
               - "EasyCLA"
           required_pull_request_reviews:
             bypass_pull_request_allowances:
-              teams: ["wg-app-runtime-platform-bots"]
+              teams: ["ard-wg-k8s-gitbot"]
             dismiss_stale_reviews: true
             require_code_owner_reviews: true
             required_approving_review_count: 1
diff --git a/toc/working-groups/app-runtime-deployments.md b/toc/working-groups/app-runtime-deployments.md
index ca88a38fa..0fb5f3646 100644
--- a/toc/working-groups/app-runtime-deployments.md
+++ b/toc/working-groups/app-runtime-deployments.md
@@ -43,6 +43,8 @@ technical_leads:
 bots:
 - name: ard-wg-gitbot
   github: ard-wg-gitbot
+- name: ard-wg-k8s-gitbot
+  github: ard-wg-k8s-gitbot
 areas:
 - name: CF Deployment
   reviewers: