Merge branch 'main' into ivaylo-bosh-reviewer

Author: beyhan

orgs/branchprotection.yml

@@ -261,6 +261,8 @@ branch-protection:
           protect: false
         capi-env-pool:
           protect: false
+        cf-openapi:
+          protect: false
 
         # CLI
         CLAW:
@@ -751,6 +753,23 @@ branch-protection:
             require_code_owner_reviews: true
             required_approving_review_count: 1
 
+        bosh-io-stemcells-cpi-index:
+          allow_deletions: false
+          allow_disabled_policies: true
+          allow_force_pushes: false
+          enforce_admins: false
+          include:
+          - ^main$
+          - ^v[0-9]*$
+          protect: true
+          required_pull_request_reviews:
+            bypass_pull_request_allowances:
+              teams:
+              - wg-foundational-infrastructure-bots
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1
+
         homebrew-tap:
           allow_deletions: false
           allow_disabled_policies: true
@@ -1011,7 +1030,7 @@ branch-protection:
             require_code_owner_reviews: true
             required_approving_review_count: 1
 
-        crecredhub-acceptance-tests:
+        credhub-acceptance-tests:
           allow_deletions: false
           allow_disabled_policies: true
           allow_force_pushes: false
@@ -1078,3 +1097,20 @@ branch-protection:
             dismiss_stale_reviews: true
             require_code_owner_reviews: true
             required_approving_review_count: 1
+
+        jumpbox-deployment:
+          allow_deletions: false
+          allow_disabled_policies: true
+          allow_force_pushes: false
+          enforce_admins: false
+          include:
+          - ^master$
+          - ^v[0-9]*$
+          protect: true
+          required_pull_request_reviews:
+            bypass_pull_request_allowances:
+              teams:
+              - wg-foundational-infrastructure-bots
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1

orgs/contributors.yml

@@ -77,7 +77,6 @@ orgs:
     - hibell
     - hsinn0
     - iaftab-alam
-    - ifindlay-cci
     - ikasarov
     - iprotsiuk
     - itsouvalas

orgs/orgs.yml

@@ -561,13 +561,15 @@ orgs:
         has_projects: true
       cert-injector:
         has_projects: true
+        archived: true
       certauthority:
         allow_merge_commit: false
         default_branch: main
         has_projects: true
       certsplitter:
         has_issues: false
         has_projects: true
+        archived: true
       cf-acceptance-tests:
         default_branch: develop
         description: CF Acceptance tests
@@ -1128,6 +1130,7 @@ orgs:
       diff-exporter:
         default_branch: main
         has_projects: true
+        archived: true
       disaster-recovery-acceptance-tests:
         default_branch: main
         description: Acceptance tests for disaster recovery of Cloud Foundry
@@ -1478,6 +1481,7 @@ orgs:
         description: A Garden image plugin for Windows
         has_projects: true
         has_wiki: false
+        archived: true
       grootfs:
         description: Garden root file system
         has_projects: true
@@ -2520,6 +2524,7 @@ orgs:
           to the OCI specification
         has_projects: true
         has_wiki: false
+        archived: true
       winc-release:
         default_branch: develop
         description: A BOSH release for deploying winc on windows

toc/ADMIN.md

@@ -81,16 +81,14 @@ areas:
     github: dlresende
   - name: George Blue
     github: blgm
-  - name: Iain Findlay
-    github: ifindlay-cci
   - name: Konstantin Kiess
     github: nouseforaname
   - name: Konstantin Semenov
     github: jhvhs
   - name: Long Nguyen
     github: lnguyen
   - name: Rajan Agaskar
-    github: ragaskar    
+    github: ragaskar
   bots:
   - name: CF CLI Eng
     github: cf-cli-eng

toc/rfc/rfc-0043-cc-blobstore-storage-cli.md

@@ -27,6 +27,7 @@ Bosh faced similar issues, as it is also written in Ruby and interacts with blob
 - https://github.com/cloudfoundry/bosh-s3cli
 - https://github.com/cloudfoundry/bosh-gcscli
 - https://github.com/cloudfoundry/bosh-ali-storage-cli
+- https://github.com/cloudfoundry/bosh-davcli
 
 These storage CLIs are implemented in Go and use the respective provider golang SDKs that are well supported for the foreseeable future.
 

toc/working-groups/app-runtime-platform.md

@@ -112,7 +112,6 @@ areas:
   - cloudfoundry/buildpackapplifecycle
   - cloudfoundry/bytefmt
   - cloudfoundry/cacheddownloader
-  - cloudfoundry/certsplitter
   - cloudfoundry/cfdot
   - cloudfoundry/cfhttp
   - cloudfoundry/clock
@@ -171,9 +170,7 @@ areas:
   - name: Alexander Lais
     github: peanball
   repositories:
-  - cloudfoundry/cert-injector
   - cloudfoundry/commandrunner
-  - cloudfoundry/diff-exporter
   - cloudfoundry/dontpanic
   - cloudfoundry/envoy-nginx-release
   - cloudfoundry/filelock
@@ -182,7 +179,6 @@ areas:
   - cloudfoundry/garden-performance-acceptance-tests
   - cloudfoundry/garden-runc-release
   - cloudfoundry/groot
-  - cloudfoundry/groot-windows
   - cloudfoundry/grootfs
   - cloudfoundry/guardian
   - cloudfoundry/hwc
@@ -191,7 +187,6 @@ areas:
   - cloudfoundry/netplugin-shim
   - cloudfoundry/test-log-emitter
   - cloudfoundry/test-log-emitter-release
-  - cloudfoundry/winc
   - cloudfoundry/winc-release
   - cloudfoundry/windows-tools-release
   - cloudfoundry/windows2016fs

toc/working-groups/foundational-infrastructure.md

@@ -124,6 +124,8 @@ areas:
     github: ragaskar
   - name: Rajath Agasthya
     github: rajathagasthya
+  - name: Julian Hjortshoj
+    github: julian-hj
   - name: Ming Xiao
     github: mingxiao
   repositories:
@@ -278,6 +280,8 @@ areas:
     github: nader-ziada
   - name: Rajath Agasthya
     github: rajathagasthya
+  - name: Julian Hjortshoj
+    github: julian-hj
   - name: Ming Xiao
     github: mingxiao
   - name: Benjamin Guttmann
@@ -289,14 +293,14 @@ areas:
   reviewers:
   - name: Sascha Stojanovic
     github: Sascha-Stoj
-  - name: Julian Hjortshoj
-    github: julian-hj
   - name: Nishad Mathur
     github: alphasite
   - name: Clay Kauzlaric
     github: KauzClay
   - name: Ivaylo Ivanov
     github: ivaylogi98
+  - name: Ned Petrov
+    github: neddp
   repositories:
   - cloudfoundry/concourse-infra-for-fiwg
   - cloudfoundry/bosh-stemcells-ci
@@ -334,6 +338,8 @@ areas:
     github: nader-ziada
   - name: Rajath Agasthya
     github: rajathagasthya
+  - name: Julian Hjortshoj
+    github: julian-hj
   - name: Ming Xiao
     github: mingxiao
   - name: Benjamin Guttmann
@@ -345,8 +351,6 @@ areas:
     github: bgandon
   - name: Sascha Stojanovic
     github: Sascha-Stoj
-  - name: Julian Hjortshoj
-    github: julian-hj
   - name: Nishad Mathur
     github: alphasite
   - name: Alexander Lais
@@ -355,6 +359,8 @@ areas:
     github: KauzClay
   - name: Ivaylo Ivanov
     github: ivaylogi98
+  - name: Ned Petrov
+    github: neddp
   repositories:
   - cloudfoundry/bbl-state-resource
   - cloudfoundry/bosh
@@ -372,7 +378,6 @@ areas:
   - cloudfoundry/bosh-cpi-certification
   - cloudfoundry/bosh-cpi-go
   - cloudfoundry/bosh-cpi-ruby
-  - cloudfoundry/bosh-davcli
   - cloudfoundry/bosh-deployment
   - cloudfoundry/bosh-deployment-resource
   - cloudfoundry/bosh-dns-aliases-release
@@ -480,6 +485,8 @@ areas:
     github: nader-ziada
   - name: Rajath Agasthya
     github: rajathagasthya
+  - name: Julian Hjortshoj
+    github: julian-hj
   - name: Ming Xiao
     github: mingxiao
   - name: Benjamin Guttmann
@@ -517,8 +524,6 @@ areas:
     github: bgandon
   - name: Sascha Stojanovic
     github: Sascha-Stoj
-  - name: Julian Hjortshoj
-    github: julian-hj
   - name: Nishad Mathur
     github: alphasite
   - name: Alexander Lais
@@ -538,6 +543,7 @@ areas:
   repositories:
   - cloudfoundry/bosh-ali-storage-cli
   - cloudfoundry/bosh-azure-storage-cli
+  - cloudfoundry/bosh-davcli
   - cloudfoundry/bosh-gcscli
   - cloudfoundry/bosh-s3cli