diff --git a/orgs/branchprotection.yml b/orgs/branchprotection.yml index 14345f81b..863128893 100644 --- a/orgs/branchprotection.yml +++ b/orgs/branchprotection.yml @@ -852,7 +852,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] csb-brokerpak-gcp: @@ -871,7 +871,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] csb-brokerpak-azure: @@ -890,7 +890,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] jdbctestapp: @@ -909,7 +909,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] upgrade-all-services-cli-plugin: @@ -928,7 +928,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] terraform-provider-csbpg: @@ -947,7 +947,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] terraform-provider-csbmysql: @@ -966,7 +966,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] terraform-provider-csbsqlserver: @@ -985,7 +985,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] brokerapi: @@ -1004,7 +1004,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] cloud-service-broker: @@ -1023,7 +1023,7 @@ branch-protection: require_code_owner_reviews: false required_approving_review_count: 1 bypass_pull_request_allowances: - teams: ["wg-service-management-cloud-service-broker-bots"] + teams: ["wg-foundational-infrastructure-cloud-service-broker-bots"] include: [ "^main$" ] uaa: diff --git a/toc/working-groups/WORKING-GROUPS.md b/toc/working-groups/WORKING-GROUPS.md index dd6192566..77b940a9b 100644 --- a/toc/working-groups/WORKING-GROUPS.md +++ b/toc/working-groups/WORKING-GROUPS.md @@ -41,7 +41,6 @@ The current working groups are: - Docs - Foundational Infrastructure - Paketo -- Service Management - Vulnerability Management - Concourse @@ -186,25 +185,6 @@ This working group has no repositories in the `cloudfoundry` GitHub organization | | Jan von Löwenstein| SAP | [@loewenstein-sap](https://github.com/loewenstein-sap) | -## Service Management - -Mission: Provides interfaces for service lifecycle within application platforms and adapters to common external service providers. - -The GitHub repos this WG manages in the `cloudfoundry` and `cloudfoundry-incubator` GitHub organization are to be labeled with the `cff-wg-service-manangement` topic. - -| Artifact | Link | -| -------------------------- | ---- | -| Charter | [service-management.md](./service-management.md) | -| Forum | [Video chat](https://zoom.us/j/96135973215?pwd=NzQrRk1tbXlTQnZEVmRNZlluSm50QT09) | -| Community Meeting Calendar | Monthly on the first Tuesday at 10:30 UK / 11:30 CET/ 16 IST / Monthly on the second Tuesday at 11:30 ET/ 16:30 UK | -| Meeting Notes | [Google Doc](https://docs.google.com/document/d/1pVepAY0IxA9zz6imyMNnZeCM_mUkxzk1Dd1PDClmkWE/view) | -| Slack Channels | [#wg-service-management](https://cloudfoundry.slack.com/archives/C02TXDMPSUS)| - -|   | Leads | Company | Profile | -| -------------------------------------------------------- | ---------------- | ------- | --------------------------------------- | -| | Marcela Campo | VMWare | [@pivotal-marcela-campo](https://github.com/pivotal-marcela-campo) | - - ## Vulnerability Management Mission: Provides discreet management of security vulnerabilities issues relevant for active CF projects. diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md index 7a3133ed8..8ffb69768 100644 --- a/toc/working-groups/foundational-infrastructure.md +++ b/toc/working-groups/foundational-infrastructure.md @@ -504,6 +504,35 @@ areas: - cloudfoundry/bosh-s3cli - cloudfoundry/storage-cli +- name: Cloud Service Broker + approvers: + - name: George Blue + github: blgm + - name: Felisia Martini + github: FelisiaM + - name: Marcela Campo + github: pivotal-marcela-campo + - name: Georgi Dim. Dimitrov + github: georgidimdimitrov + - name: Bogomil Kuzmanov + github: bogomil-kuzmanov + bots: + - name: Services Enablement bot + github: servicesenablement + - name: cf-gitbot + github: cf-gitbot + repositories: + - cloudfoundry/cloud-service-broker + - cloudfoundry/csb-brokerpak-azure + - cloudfoundry/csb-brokerpak-aws + - cloudfoundry/csb-brokerpak-gcp + - cloudfoundry/jdbctestapp + - cloudfoundry/upgrade-all-services-cli-plugin + - cloudfoundry/terraform-provider-csbpg + - cloudfoundry/terraform-provider-csbmysql + - cloudfoundry/terraform-provider-csbsqlserver + - cloudfoundry/brokerapi + config: github_project_sync: mapping: diff --git a/toc/working-groups/service-management.md b/toc/working-groups/service-management.md deleted file mode 100644 index d97974b1b..000000000 --- a/toc/working-groups/service-management.md +++ /dev/null @@ -1,64 +0,0 @@ -# Service Management: Working Group Charter - -## Mission - -Provides interfaces for service lifecycle within application platforms and adapters to common external service providers. - -## Goals - -- Define the service extension API for Cloud Foundry brokered services. -- Provide a flexible adapter layer to common hyperscaler service providers. - -## Scope -- Lead OSB API. -- Develop and maintain Cloud Service Brokers for AWS, Azure, and GCP. -- Develop and maintain ServiceFabrik, a generic BOSH-based and Docker-container-based service instance manager. - -## Non-Goals - -## Roles & Technical Assets -Components from the Cloud Service Broker, Open Service Broker API and Service Fabrik. - -```yaml -name: Service Management -execution_leads: -- name: Marcela Campo - github: pivotal-marcela-campo -technical_leads: -- name: Marcela Campo - github: pivotal-marcela-campo -bots: -- name: cf-gitbot - github: cf-gitbot -areas: -- name: Cloud Service Broker - approvers: - - name: George Blue - github: blgm - - name: Felisia Martini - github: FelisiaM - - name: Marcela Campo - github: pivotal-marcela-campo - - name: Georgi Dim. Dimitrov - github: georgidimdimitrov - - name: Bogomil Kuzmanov - github: bogomil-kuzmanov - bots: - - name: Services Enablement bot - github: servicesenablement - repositories: - - cloudfoundry/cloud-service-broker - - cloudfoundry/csb-brokerpak-azure - - cloudfoundry/csb-brokerpak-aws - - cloudfoundry/csb-brokerpak-gcp - - cloudfoundry/jdbctestapp - - cloudfoundry/upgrade-all-services-cli-plugin - - cloudfoundry/terraform-provider-csbpg - - cloudfoundry/terraform-provider-csbmysql - - cloudfoundry/terraform-provider-csbsqlserver - - cloudfoundry/brokerapi -config: - github_project_sync: - mapping: - cloudfoundry: 27 -```