Merge branch 'cloudfoundry:main' into main

ireneGonzalezRuiz · web-flow · commit b20b63b2babf · 2025-07-17T12:30:10.000+02:00
diff --git a/.github/workflows/remove-individual-access.yml b/.github/workflows/remove-individual-access.yml
@@ -13,6 +13,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: community
+      - name: Install yq
+        run: sudo wget https://oauth2:${{ secrets.GITHUB_TOKEN }}@github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq -q && sudo chmod +x /usr/bin/yq
       - name: Remove individual access to repos
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/orgs/branchprotection.yml b/orgs/branchprotection.yml
@@ -359,3 +359,194 @@ branch-protection:
             bypass_pull_request_allowances:
               teams: ["wg-foundational-infrastructure-bots"]
           include: [ "^main$" ]
+
+        # Service Management Repos to skip branch protection on
+        csb-brokerpak-aws:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]
+        
+        csb-brokerpak-gcp:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection          
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]
+
+        csb-brokerpak-azure:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]
+
+        jdbctestapp:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]
+
+        upgrade-all-services-cli-plugin:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]
+
+        terraform-provider-csbpg:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]  
+
+        terraform-provider-csbmysql:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]  
+
+        terraform-provider-csbsqlserver:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]  
+
+        brokerapi:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]    
+
+        cloud-service-broker:
+          protect: true
+          enforce_admins: false
+          required_linear_history: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true  # needed to allow branches w/o branch protection
+          required_status_checks:
+            strict: true
+            contexts:
+            - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: false
+            require_code_owner_reviews: false
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-service-management-cloud-service-broker-bots"]
+          include: [ "^main$" ]  
diff --git a/orgs/contributors.yml b/orgs/contributors.yml
@@ -22,6 +22,7 @@ orgs:
     - Benjamintf1
     - beyhan
     - bgandon
+    - Bhuvisha03
     - Birdrock
     - blgm
     - bonzofenix
@@ -69,7 +70,7 @@ orgs:
     - genevieve
     - geofffranks
     - georgethebeatle
-    - Gerg
+    - gerg
     - gm2552
     - Gourab1998
     - gururajsh
@@ -125,6 +126,7 @@ orgs:
     - nader-ziada
     - nand2
     - navinms711
+    - neowulf
     - norman-abramovitz
     - nouseforaname
     - ohkyle
@@ -201,6 +203,7 @@ orgs:
     - xtremerui
     - Yavor16
     - stiv03
+    - karrgov
     - ystros
     - ZPascal
     - zucchinidev
@@ -213,3 +216,4 @@ orgs:
     - dtasSap
     - ireneGonzalezRuiz
     - praveenkalluri18
+    - Jobsby
diff --git a/orgs/orgs.yml b/orgs/orgs.yml
@@ -418,6 +418,8 @@ orgs:
         has_projects: false
         has_wiki: false
       bosh-windows-acceptance-tests:
+        archived: true
+        default_branch: windows-2019
         has_projects: true
       bosh-windows-stemcell-builder:
         default_branch: windows-2019
diff --git a/toc/TOC.md b/toc/TOC.md
@@ -63,11 +63,11 @@ the Cloud Foundry community via an election.
 
 | &nbsp;                                                       | Member                 | Company     | Profile                                          | Term Start | Term End |
 | ------------------------------------------------------------ | -----------------------| ----------- | ------------------------------------------------ | ---------- | --------
-| <img width="30px" src="https://github.com/ameowlia.png">     | Amelia Downs           | VMware      | [@ameowlia](https://github.com/ameowlia)         | 2023-06-21 | 2025     |
-| <img width="30px" src="https://github.com/beyhan.png">       | Beyhan Veli (TOC Chair)| SAP         | [@beyhan](https://github.com/beyhan)             | 2022-06-22 | 2024     |
-| <img width="30px" src="https://github.com/ChrisMcGowan.png"> | Chris McGowan          | Cloud.gov   | [@ChrisMcGowan](https://github.com/ChrisMcGowan) | 2023-06-21 | 2025     |
-| <img width="30px" src="https://github.com/rkoster.png">      | Ruben Koster           | VMware      | [@rkoster](https://github.com/rkoster)           | 2022-06-22 | 2024     |
-| <img width="30px" src="https://github.com/stephanme.png">    | Stephan Merker         | SAP         | [@stephanme](https://github.com/stephanme)       | 2023-06-21 | 2025     |
+| <img width="30px" src="https://github.com/beyhan.png">       | Beyhan Veli (TOC Chair)| SAP         | [@beyhan](https://github.com/beyhan)             | 2024-06-21 | 2026     |
+| <img width="30px" src="https://github.com/Cweibel.png">      | Chris Weibel           | Cloud.gov   | [@cweibel](https://github.com/cweibel)           | 2025-07-01 | 2027     |
+| <img width="30px" src="https://github.com/gerg.png">         | Greg Cobb              | VMware      | [@gerg](https://github.com/Gerg)                 | 2025-07-01 | 2027     |
+| <img width="30px" src="https://github.com/rkoster.png">      | Ruben Koster           | VMware      | [@rkoster](https://github.com/rkoster)           | 2024-06-21 | 2026     |
+| <img width="30px" src="https://github.com/stephanme.png">    | Stephan Merker         | SAP         | [@stephanme](https://github.com/stephanme)       | 2025-07-01 | 2027     |
 
 
 ## Elections
@@ -119,12 +119,12 @@ under the terms of the [Creative Commons Attribution 4.0 License](https://creati
 ```yaml
 name: Technical Oversight Committee
 execution_leads:
-- name: Amelia Downs
-  github: ameowlia
 - name: Beyhan Veli
   github: beyhan
-- name: Chris McGowan
-  github: ChrisMcGowan
+- name: Chris Weibel
+  github: cweibel
+- name: Greg Cobb
+  github: gerg
 - name: Ruben Koster
   github: rkoster
 - name: Stephan Merker
diff --git a/toc/working-groups/app-runtime-deployments.md b/toc/working-groups/app-runtime-deployments.md
@@ -48,6 +48,8 @@ areas:
   reviewers:
   - github: oliver-heinrich
     name: Oliver Heinrich
+  - github: Milena-Encheva
+    name: Milena Encheva
   approvers:
   - github: davewalter
     name: Dave Walter
diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md
@@ -336,9 +336,6 @@ areas:
     github: nookala
   - name: George Gelashvili
     github: pivotalgeorge
-  bots:
-  - name: capi-bot
-    github: capi-bot
   repositories:
   - cloudfoundry/cloud_controller_ng
   - cloudfoundry/capi-release
@@ -414,6 +411,10 @@ areas:
   reviewers:
   - name: Georg Lokowandt
     github: Lokowandtg
+  - name: Stefan Yonkov
+    github: s-yonkov-yonkov
+  - name: Kristian Atanasov
+    github: theghost5800
   approvers:
   - name: Daniel Mikusa
     github: dmikusa
@@ -476,6 +477,8 @@ areas:
     github: MNoeva
   - name: Stoyan Ivanov
     github: stiv03
+  - name: Krasimir Kargov
+    github: karrgov
   bots:
   - name: MultiApps Bot
     github: cf-mta-deploy-bot
diff --git a/toc/working-groups/app-runtime-platform.md b/toc/working-groups/app-runtime-platform.md
@@ -103,6 +103,8 @@ areas:
     github: kart2bc
   - name: Plamen Bardarov
     github: plamen-bardarov
+  - name: Alexander Lais
+    github: peanball
   repositories:
   - cloudfoundry/archiver
   - cloudfoundry/auction
@@ -167,6 +169,8 @@ areas:
     github: kart2bc
   - name: Tim Downey
     github: tcdowney
+  - name: Alexander Lais
+    github: peanball
   repositories:
   - cloudfoundry/cert-injector
   - cloudfoundry/commandrunner
@@ -212,6 +216,8 @@ areas:
   - name: Jovan Kostovski
     github: chombium
   reviewers:
+  - name: Pascal Zimmermann
+    github: ZPascal
   - name: Felix Hambrecht
     github: fhambrec
   - name: Glenn Oppegard
@@ -280,12 +286,10 @@ areas:
     github: ebroberson
   - name: Carson Long
     github: ctlong
-  - name: Dominik Froehlich
-    github: domdom82
   - name: Geoff Franks
     github: geofffranks
   - name: Greg Cobb
-    github: Gerg
+    github: gerg
   - name: Maria Shaldybin
     github: mariash
   - name: Matthew Kocher
diff --git a/toc/working-groups/contributions-for-user.sh b/toc/working-groups/contributions-for-user.sh
diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md
diff --git a/toc/working-groups/parsable-working-groups.sh b/toc/working-groups/parsable-working-groups.sh
