Merge branch 'main' into patch-3

Author: Gerg

governing-board/charter.md

@@ -2,7 +2,7 @@ The Cloud Foundry Foundation Charter
 
 The Linux Foundation
 
-Effective May 1, 2023
+Effective September 15, 2023
 
 
 #### 1)	Mission and Scope of the Cloud Foundry Foundation.  
@@ -221,8 +221,10 @@ c)	The Governing Board manages the CFF. The CFF will also have an Outreach Commi
 -   f)  TOC Member Resignations or Removal
 
     -   i) In the case where a TOC member resigns or is removed from the TOC by the Governing Board, the remaining members of the TOC will determine whether the vacant seat either will remain vacant until the next annual election cycle, or will be filled by using the results of the latest election.
-    
-    -   ii) When making this decision, the remaining members of the TOC should consider whether too much time has elapsed since the latest election cycle for its results to represent the community adequately.
+
+    -   ii) In the case where a TOC member was an employee of a governmental agency at the time of their election to the TOC, that governmental agency may appoint a similarly qualified replacement TOC member to fulfill the remainder of that TOC member’s term if that member changes employers or moves to a different internal role. This replacement member must meet community qualifications for a TOC nomination and/or receive an exemption from the TOC to fulfill the remainder of that term. If the appointed replacement member does not fulfill their TOC obligations, the TOC majority can request the Governing Board to remove that person, and as such any governmental agency interests in that seat are removed.
+
+    -   iii) When making this decision, the remaining members of the TOC should consider whether too much time has elapsed since the latest election cycle for its results to represent the community adequately.
 
 ####    8)	Voting
 

org/branchprotection.yml

@@ -5,7 +5,7 @@ branch-protection:
     cloudfoundry:
       repos:
         # example repo configured as if the project would belong to ARD WG, area CF Deployment
-        # automation would generate repo/branch config for all repos belonging to a WG unless an explicit configuration exists here 
+        # automation would generate repo/branch config for all repos belonging to a WG unless an explicit configuration exists here
         branchprotection-test:
           protect: true
           enforce_admins: true
@@ -53,12 +53,12 @@ branch-protection:
           protect: false
         haproxy-boshrelease:
           protect: true
-          enforce_admins: true
+          enforce_admins: false
           allow_force_pushes: false
           allow_deletions: false
           allow_disabled_policies: true
           include: ["^master$"]
-          required_status_checks: 
+          required_status_checks:
             contexts: ["concourse-ci/unit-tests","concourse-ci/acceptance-tests"]
           required_pull_request_reviews:
             dismiss_stale_reviews: true
@@ -68,16 +68,45 @@ branch-protection:
               teams: ["wg-app-runtime-platform-bots"]
         pcap-release:
           protect: true
-          enforce_admins: true
+          enforce_admins: false
           allow_force_pushes: false
           allow_deletions: false
           allow_disabled_policies: true
           include: ["^main$"]
-          required_status_checks: 
+          required_status_checks:
             contexts: ["concourse-ci/unit-tests","concourse-ci/acceptance-tests"]
           required_pull_request_reviews:
             dismiss_stale_reviews: true
             require_code_owner_reviews: true
             required_approving_review_count: 1
             bypass_pull_request_allowances:
               teams: ["wg-app-runtime-platform-bots"]
+
+        # CF-on-K8s
+        korifi-ci:
+          protect: false
+        cf-k8s-secrets:
+          protect: false
+        korifi:
+          protect: true
+          enforce_admins: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true
+          include: ["^main$"]
+          required_status_checks:
+            contexts:
+              - "api-tests"
+              - "controllers-tests"
+              - "linter"
+              - "job-task-runner-tests"
+              - "kpack-image-builder-tests"
+              - "statefulset-runner-tests"
+              - "tools-tests"
+              - "Concourse / e2e-tests (pull_request)"
+              - "Concourse / e2e-eks-tests (pull_request)"
+              - "EasyCLA"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1

org/cloudfoundry.yml

@@ -312,6 +312,7 @@ orgs:
         description: Java release for OpenJDK for use with `bosh vendor-package`
         default_branch: main
         has_projects: false
+        archived: true
       bosh-package-nginx-release:
         description: Nginx release for use with `bosh vendor-package`
         default_branch: main
@@ -549,6 +550,7 @@ orgs:
         default_branch: main
         has_projects: true
       cf-drain-cli:
+        archived: true
         allow_merge_commit: false
         default_branch: main
         description: CF CLI plugin to create syslog drains
@@ -777,9 +779,11 @@ orgs:
         archived: true
         has_projects: true
       cflinuxfs3:
+        archived: true
         default_branch: main
         has_projects: true
       cflinuxfs3-release:
+        archived: true
         default_branch: main
         description: Cloud Foundry stack based on Ubuntu 18.04 LTS
         has_projects: true
@@ -1351,6 +1355,9 @@ orgs:
         description: SOCKS5 server in Golang
         has_issues: false
         has_projects: true
+      go-uaa:
+        description: API for UAA written in Go
+        has_projects: true
       gofileutils:
         archived: true
         description: A collection of go packages to simplify working with files.
@@ -1433,6 +1440,7 @@ orgs:
         description: where everything else lives
         has_projects: true
         private: true
+        archived: true
       identity-tools:
         description: 'Cloud Foundry - the open platform as a service project '
         has_projects: true
@@ -1847,6 +1855,9 @@ orgs:
         description: 'Lab assets for Cloud Foundry class at Open Source Summit ''18
           in Vancouver '
         has_projects: true
+      otel-collector-release:
+        description: BOSH release for the OpenTelemetry Collector
+        has_projects: false
       overview-broker:
         allow_merge_commit: false
         description: A service broker that provides an overview of its service instances
@@ -1900,7 +1911,7 @@ orgs:
         has_projects: true
         private: true
       postgres-release:
-        default_branch: develop
+        default_branch: main
         description: BOSH release for PostgreSQL
         has_projects: true
       procfile-cnb:
@@ -2141,6 +2152,7 @@ orgs:
         has_projects: true
         private: true
       silk:
+        archived: true
         allow_merge_commit: false
         default_branch: main
         description: a network fabric for containers.  inspired by flannel, designed
@@ -2264,6 +2276,7 @@ orgs:
         default_branch: main
         has_projects: true
       systemcerts:
+        archived: true
         allow_merge_commit: false
         has_issues: false
         has_projects: true
@@ -2274,6 +2287,13 @@ orgs:
         description: Terraform provider to manage Cloud Service Broker bindings for MySQL
         has_projects: true
         has_wiki: false
+      terraform-provider-csbsqlserver:
+        allow_merge_commit: false
+        allow_rebase_merge: false
+        default_branch: main
+        description: Terraform provider to manage Cloud Service Broker bindings for SQL Server
+        has_projects: true
+        has_wiki: false
       terraform-provider-csbpg:
         allow_merge_commit: false
         allow_rebase_merge: false
@@ -2462,10 +2482,28 @@ orgs:
           - a-b
           - gururajsh
           - reedr3
+          - ccjaimes
         members: []
         privacy: closed
         repos:
           CLAW: admin
           cli-ci: admin
           cli-plugin-repo: admin
           cli: admin
+      temp-multiapps-admins:
+        description: "Temporary team for managing MultiApps secrets until we have a permanent plan."
+        maintainers:
+          - IvanBorislavovDimitrov
+          - theghost5800
+          - boyan-velinov
+          - radito3
+          - ikasarov
+          - vkalapov
+          - VRBogdanov
+        members: []
+        privacy: closed
+        repos:
+          multiapps: admin
+          multiapps-controller: admin
+          multiapps-cli-plugin: admin
+

org/contributors.yml

@@ -5,7 +5,6 @@ contributors:
 - a-sudarsanan
 - aaronshurley
 - ab-pivot
-- abdermendz
 - AbelHu
 - abg
 - abh1kg
@@ -80,6 +79,7 @@ contributors:
 - Birdrock
 - bkeelapudi
 - blgm
+- blora1
 - bobbygeeze
 - bonzofenix
 - bosh-admin-bot
@@ -590,6 +590,7 @@ contributors:
 - teddyking
 - Tejuvmware
 - tekul
+- ten4o
 - test-12341234
 - theghost5800
 - thepeterstone
@@ -625,7 +626,6 @@ contributors:
 - wayneadams
 - WeiQuan0605
 - weymanf
-- will-gant
 - willmadison
 - winkingturtle-vmw
 - xandroc
@@ -654,3 +654,5 @@ contributors:
 - HenryBorys
 - adrianhoelzl-sap
 - radoslav-tomov
+- VRBogdanov
+- klaus-sap

toc/ROLES.md

@@ -253,16 +253,11 @@ in.
 
 A reviewer is an active contributor who wishes to formally work toward the approver role.
 
-Reviewers can submit reviews of PRs within a working group area. They may also have PRs within a working group assigned to them.
+Reviewers can submit reviews of PRs within a Working Group Area. They may also have PRs within a working group assigned to them.
 
 ### Requirements
 
-- Submission of a PR to the appropriate Working Group Charter that adds themselves to the team's yaml definition.
-
-- Approval from two existing Approvers for that Working Group
-
-    - For Working Groups with fewer than 4 approvers, a single Approver review is sufficient.
-  
+- Actively contributing to the relevant Working Group Area(s).
 
 ### Responsibilities and privileges
 
@@ -305,6 +300,12 @@ approver in an OWNERS file:
    - A technical discussion is a thread on slack or in GitHub that requires knowledge of the codebase. The following are examples of technical discussions that will be considered: resolving interrupts in slack, or commenting on proposals. Technical discussions are counted per-thread, not per-message.
    - The WG lead has final say if an issue, PR, or discussion is considered substantial.
 
+The [contributions-for-user.sh script](https://github.com/cloudfoundry/community/blob/main/toc/working-groups/contributions-for-user.sh) can be used to help gather information from GitHub related to Issues, PRs, and code contributions. It requires the `gh` CLI, and for users to authenticate with credentials allowing Gist creation:
+
+```
+./working-groups/contributions-for-user.sh <github username> <working group name>
+```
+
 - Nominated by a WG lead (with no objections from other leads).
 
 ### Responsibilities and privileges
@@ -492,33 +493,34 @@ Last ammended by [RFC-0008 Role Change Process](https://github.com/cloudfoundry/
 they may submit a PR adding themselves to 
 [contributors.yml](https://github.com/cloudfoundry/community/blob/main/org/contributors.yml).
 
-- Two existing Contributors or Approvers must attest that they meet the criteria
-  by reviewing the PR.
+- Two existing Contributors, Reviewers, or Approvers must attest that they meet
+  the criteria by reviewing the PR.
 
-- An existing Contributor or Approver may submit the promotion request on behalf of someone else, but they
-  may not serve as a reviewer.
+- An existing Contributor, Reviewer, or Approver may submit the promotion
+  request on behalf of someone else, but they may not serve as a reviewer.
 
 - A Working Group Lead from any Working Group will merge or close the PR, based
   on the results of the review and their discretion.
 
 - TOC members may bypass the review process and merge the PR at their
   discretion.
 
-### Promotion to Approver
+### Promotion to Reviewer or Approver
 
-- When a person meets the criteria to be an Approver for a Working Group as defined in
-[Approver Role](#approver),
-they may submit a PR to the appropriate Working Group Charter that adds
-themselves to the team's yaml definition.
+- When a person meets the criteria to be a Reviewer or Approver for a Working
+  Group Area as defined in [Reviewer Role](#reviewer) or [Approver
+  Role](#approver) respectively, they may submit a PR to the appropriate
+  Working Group Charter that adds themselves to the team's yaml definition
+  under the appropriate Area.
 
-- Two existing Approvers for that Working Group must attest that they meet the criteria
-  by reviewing the PR.
+- Two existing Approvers for that Working Group Area must attest that they meet
+  the criteria by reviewing the PR.
 
-- For Working Groups with fewer than 4 approvers, a single Approver review is
-  sufficient.
+- For Working Group Areas with fewer than 4 Approvers, a single Approver review
+  is sufficient.
 
-- An existing Approver may submit the promotion request on behalf of someone else, but they
-  may not serve as a reviewer.
+- An existing Approver may submit the promotion request on behalf of someone
+  else, but they may not serve as a reviewer.
 
 - A Working Group Lead for that Working Group will merge or close the PR, based
   on the results of the review and their discretion.
@@ -532,19 +534,20 @@ themselves to the team's yaml definition.
   removing the appropriate entry from
   [contributors.yml](https://github.com/cloudfoundry/community/blob/main/org/contributors.yml).
 
-- An existing Contributor or Approver may submit the revocation request on
-  behalf of someone else, but the person whose role is being revoked must be
-  given two weeks to refute the revocation.
+- An existing Contributor, Reviewer, or Approver may submit the revocation
+  request on behalf of someone else, but the person whose role is being revoked
+  must be given two weeks to refute the revocation.
 
 - A Working Group Lead from any Working Group will merge or close the PR, at
   their discretion and without review.
 
 - TOC members may merge the PR at their discretion.
 
-### Revoking Approver Role
+### Revoking Reviewer or Approver Role
 
-- People with an Approver role may submit a PR to revoke their role by removing
-  the appropriate entry from the yaml definition in their Working Group's charter.
+- People with a Reviewer or Approver role may submit a PR to revoke their role
+  by removing the appropriate entry from the yaml definition in their Working
+  Group's charter.
 
 - An existing Approver may submit the revocation request on behalf of someone
   else, but the person whose role is being revoked must be given two weeks to

toc/rfc/assign-rfc-number.sh

@@ -27,7 +27,7 @@ NOPUSH=${NOPUSH:-}
 #
 
 generate_id() {
-  id="$(find "$script_dir" -maxdepth 2 -type f | sed 's/[^0-9]*//' | sed -E 's|^([[:digit:]]{4})-.*$|\1|' | sort | tail -n 1  |  sed 's/^0*//')"
+  id="$(find "$script_dir" -maxdepth 2 -type f -exec basename {} \; | sed 's/[^0-9]*//' | sed -E 's|^([[:digit:]]{4})-.*$|\1|' | sort | tail -n 1 | sed 's/^0*//')"
   ((id++))
   printf "%04d" "${id}"
 }

toc/rfc/rfc-draft-aggregate-metric-egress-with-opentelemetry-collector.md renamed to toc/rfc/rfc-0018-aggregate-metric-egress-with-opentelemetry-collector.md

@@ -3,8 +3,8 @@
 - Name: Add OTel Collector for aggregate metric egress
 - Start Date: 2023-07-07
 - Author(s): @ctlong, @mkocher, @acrmp, @rroberts2222
-- Status: Draft <!-- Acceptable values: Draft, Approved, On Hold, Superseded -->
-- RFC Pull Request: (fill in with PR link after you submit it)
+- Status: Accepted
+- RFC Pull Request: [community#641](https://github.com/cloudfoundry/community/pull/641)
 
 
 ## Summary