From 30773168f9df1efc23a01090ce772a1ceb272add Mon Sep 17 00:00:00 2001 From: Brayan Henao Date: Fri, 31 May 2024 00:33:43 -0500 Subject: [PATCH 01/16] Cleanup buildpacks repos access for people no longer part of team --- org/cloudfoundry.yml | 1 - toc/working-groups/app-runtime-interfaces.md | 32 ++------------------ 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/org/cloudfoundry.yml b/org/cloudfoundry.yml index e3f53b7d..2c3defbf 100644 --- a/org/cloudfoundry.yml +++ b/org/cloudfoundry.yml @@ -2450,7 +2450,6 @@ orgs: description: "Temporary team for managing Buildpacks secrets until we have a permanent plan." maintainers: - arjun024 - - brayanhenao - sophiewigmore members: [] privacy: closed diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md index fd7730f9..90515521 100644 --- a/toc/working-groups/app-runtime-interfaces.md +++ b/toc/working-groups/app-runtime-interfaces.md @@ -78,16 +78,12 @@ areas: approvers: - name: Forest Eckhardt github: ForestEckhardt - - name: Victoria Campbell - github: TisVictress repositories: - cloudfoundry/docs-buildpacks - cloudfoundry/example-sidecar-buildpack - name: Buildpacks Go approvers: - - name: Brayan Henao - github: brayanhenao - name: Forest Eckhardt github: ForestEckhardt - name: Rob Dimsdale-Zucker @@ -139,28 +135,20 @@ areas: github: ForestEckhardt - name: Sophie Wigmore github: sophiewigmore - - name: Victoria Campbell - github: TisVictress repositories: - cloudfoundry/hwc-buildpack - cloudfoundry/hwc-buildpack-release - name: Buildpacks Node.js approvers: - - name: Brayan Henao - github: brayanhenao - - name: Tim Hitchener - github: thitch97 - - name: Victoria Campbell - github: TisVictress + - name: Rob Dimsdale-Zucker + github: robdimsdale repositories: - cloudfoundry/nodejs-buildpack - cloudfoundry/nodejs-buildpack-release - name: Buildpacks PHP approvers: - - name: Tim Hitchener - github: thitch97 - name: Sophie Wigmore github: sophiewigmore - name: Arjun Sreedharan @@ -171,8 +159,6 @@ areas: - name: Buildpacks Python approvers: - - name: Tim Hitchener - github: thitch97 - name: Rob Dimsdale-Zucker github: robdimsdale repositories: @@ -181,8 +167,6 @@ areas: - name: Buildpacks R approvers: - - name: Tim Hitchener - github: thitch97 - name: Rob Dimsdale-Zucker github: robdimsdale repositories: @@ -191,8 +175,6 @@ areas: - name: Buildpacks Ruby approvers: - - name: Brayan Henao - github: brayanhenao - name: Sophie Wigmore github: sophiewigmore - name: Rob Dimsdale-Zucker @@ -203,8 +185,6 @@ areas: - name: Buildpacks Stacks approvers: - - name: Brayan Henao - github: brayanhenao - name: Sophie Wigmore github: sophiewigmore - name: Rob Dimsdale-Zucker @@ -217,8 +197,6 @@ areas: - name: Buildpacks Tooling approvers: - - name: Brayan Henao - github: brayanhenao - name: Forest Eckhardt github: ForestEckhardt - name: Sophie Wigmore @@ -244,8 +222,6 @@ areas: github: arjun024 - name: Daniel Mikusa github: dmikusa - - name: Tim Hitchener - github: thitch97 - name: Forest Eckhardt github: ForestEckhardt - name: David O'Sullivan @@ -262,12 +238,8 @@ areas: approvers: - name: Arjun Sreedharan github: arjun024 - - name: Tim Hitchener - github: thitch97 - name: Forest Eckhardt github: ForestEckhardt - - name: Victoria Campbell - github: tisvictress repositories: - cloudfoundry/nginx-buildpack - cloudfoundry/nginx-buildpack-release From 3216558505b7fb6d604bfea7ab3ae96d5b514088 Mon Sep 17 00:00:00 2001 From: Anita Flegg Date: Mon, 24 Jun 2024 09:45:20 -0700 Subject: [PATCH 02/16] remove user Max Hufnagel as an approver --- toc/working-groups/docs.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/toc/working-groups/docs.md b/toc/working-groups/docs.md index 327386d7..76f48d8f 100644 --- a/toc/working-groups/docs.md +++ b/toc/working-groups/docs.md @@ -38,8 +38,6 @@ bots: [] areas: - name: Docs approvers: - - name: Max Hufnagel - github: animatedmax - name: Anita Flegg github: anita-flegg - name: Samia Nneji From 723bda6c9b775b7dc678841d972ff2990a13abba Mon Sep 17 00:00:00 2001 From: beyhan Date: Mon, 1 Jul 2024 00:14:12 +0000 Subject: [PATCH 03/16] Delete inactive users --- org/contributors.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/org/contributors.yml b/org/contributors.yml index df455f64..6104d0e4 100644 --- a/org/contributors.yml +++ b/org/contributors.yml @@ -15,7 +15,6 @@ contributors: - anoopjb - anshrupani - anthonydahanne -- antonina-kyoseva - app-autoscaler-ci-bot - aqstack - aramprice @@ -136,7 +135,6 @@ contributors: - MerricdeLauney - metric-store-ci - mingxiao -- MirahImage - mkocher - modulo11 - moggibear @@ -167,7 +165,6 @@ contributors: - pivotal-marcela-campo - pivotalgeorge - plowin -- Pooja-08 - radhavmwtnz - radito3 - radoslav-tomov @@ -222,7 +219,6 @@ contributors: - torsten-sap - totherme - vinaybheri -- visargsoneji - vkalapov - VRBogdanov - WeiQuan0605 From d762f502f1d2083cde139c00a97a328cf3518b50 Mon Sep 17 00:00:00 2001 From: AL Berez Date: Tue, 2 Jul 2024 10:49:29 -0700 Subject: [PATCH 04/16] Add Michael Chinigo as CLI reviewer Michael is a seasoned developer who actively participates in CLI development and maintenance. --- toc/working-groups/app-runtime-interfaces.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md index 89c2f531..9af91a3f 100644 --- a/toc/working-groups/app-runtime-interfaces.md +++ b/toc/working-groups/app-runtime-interfaces.md @@ -377,6 +377,8 @@ areas: github: tcdowney - name: Sam Gunaratne github: samze + - name: Michael Chinigo + github: chinigo bots: - name: CF CLI Eng github: cf-cli-eng From 16f3cd6a646156bae642f37d0a07c8c8b3d99a60 Mon Sep 17 00:00:00 2001 From: AL Berez Date: Tue, 2 Jul 2024 10:52:56 -0700 Subject: [PATCH 05/16] Add Greg Weresch as CLI reviewer @weresch is a seasoned developer who actively participates in CLI development and maintenance. I endorse him as a CLI reviewer. --- toc/working-groups/app-runtime-interfaces.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md index 89c2f531..84d14dc1 100644 --- a/toc/working-groups/app-runtime-interfaces.md +++ b/toc/working-groups/app-runtime-interfaces.md @@ -377,6 +377,8 @@ areas: github: tcdowney - name: Sam Gunaratne github: samze + - name: Greg Weresch + github: weresch bots: - name: CF CLI Eng github: cf-cli-eng From d7605e178829cb142bd59f1fcf86954d7f9c9477 Mon Sep 17 00:00:00 2001 From: Sam Gunaratne Date: Tue, 2 Jul 2024 16:15:09 -0600 Subject: [PATCH 06/16] Add Sam Gunaratne as CAPI Approver --- toc/working-groups/app-runtime-interfaces.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md index 89c2f531..93098089 100644 --- a/toc/working-groups/app-runtime-interfaces.md +++ b/toc/working-groups/app-runtime-interfaces.md @@ -297,6 +297,8 @@ areas: github: kathap - name: Ben Fuller github: Benjamintf1 + - name: Sam Gunaratne + github: samze reviewers: - name: Al Berez github: a-b @@ -318,8 +320,6 @@ areas: github: pivotalgeorge - name: Cristhian Peña github: ccjaimes - - name: Sam Gunaratne - github: samze bots: - name: capi-bot github: capi-bot From 29cebb98b866f3808ebe220f7b521d7a069f8f21 Mon Sep 17 00:00:00 2001 From: Benjamin Gandon Date: Fri, 5 Jul 2024 17:30:30 +0200 Subject: [PATCH 07/16] Add bgandon to the Stemcell Release Engineering area of the Foundational Infrastructure working group --- toc/working-groups/foundational-infrastructure.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md index aaa229e9..283471eb 100644 --- a/toc/working-groups/foundational-infrastructure.md +++ b/toc/working-groups/foundational-infrastructure.md @@ -350,6 +350,8 @@ areas: github: fearoffish - name: Rajath Agasthya github: rajathagasthya + - name: Benjamin Gandon + github: bgandon repositories: - cloudfoundry/bbl-state-resource - cloudfoundry/bosh From e65ab296a0e3580b2b87cb01156e32e759f05f20 Mon Sep 17 00:00:00 2001 From: Rajath Agasthya Date: Tue, 2 Jul 2024 17:36:01 -0400 Subject: [PATCH 08/16] [#187767351] archive windows-utilities-tests repo Signed-off-by: Nitin Ravindran --- org/cloudfoundry.yml | 1 + toc/working-groups/foundational-infrastructure.md | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/org/cloudfoundry.yml b/org/cloudfoundry.yml index fa4567ac..e871b5f5 100644 --- a/org/cloudfoundry.yml +++ b/org/cloudfoundry.yml @@ -2454,6 +2454,7 @@ orgs: has_projects: true windows-utilities-tests: has_projects: true + archived: true windows2016fs: description: A rootfs for Windows containers in Cloud Foundry has_projects: true diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md index aaa229e9..45036139 100644 --- a/toc/working-groups/foundational-infrastructure.md +++ b/toc/working-groups/foundational-infrastructure.md @@ -422,7 +422,6 @@ areas: - cloudfoundry/stembuild - cloudfoundry/usn-resource - cloudfoundry/windows-utilities-release - - cloudfoundry/windows-utilities-tests - cloudfoundry/yagnats - name: Ali Cloud VM deployment lifecycle (BOSH) approvers: From 1bdffa76b8ac8fe05ff198ace4caa4f9ed1d9867 Mon Sep 17 00:00:00 2001 From: Beyhan Veli Date: Wed, 3 Jul 2024 16:24:05 +0200 Subject: [PATCH 09/16] Extend inactive user automation to warn about inactive WG users --- org/org_management.py | 7 ++++--- org/org_user_management.py | 35 ++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/org/org_management.py b/org/org_management.py index 3496574d..2e6aa7cc 100644 --- a/org/org_management.py +++ b/org/org_management.py @@ -88,10 +88,11 @@ def load_from_project(self): def get_contributors(self) -> Set[str]: return set(self.contributors) - def get_community_members_with_role(self) -> Set[str]: - result = set(self.toc) + def get_community_members_with_role_by_wg(self) -> Dict[str, Set[str]]: + result = dict() + result["toc"] = set(self.toc) for wg in self.working_groups: - result |= OrgGenerator._wg_github_users(wg) + result[wg["name"]] = OrgGenerator._wg_github_users(wg) return result def generate_org_members(self): diff --git a/org/org_user_management.py b/org/org_user_management.py index ac7ba90e..065d3d70 100644 --- a/org/org_user_management.py +++ b/org/org_user_management.py @@ -90,6 +90,13 @@ def _write_yaml_file(self, path, data): with open(path, "w") as f: yaml.dump(data, f) + def _get_inactive_users_msg_for_wgs(self, inactive_users_by_wg, user_tagging_prefix): + result = "" if len(inactive_users_by_wg.keys()) == 0 else "\n\nWarning:\n" + for wg in inactive_users_by_wg.keys(): + wg_users_as_list = "\n".join(str(user_tagging_prefix + s) for s in inactive_users_by_wg[wg]) + result += f'Inactive users of Working Group "{wg}" are: \n{wg_users_as_list}\n' + return result + def delete_inactive_contributors(self, users_to_delete): path = f"{_SCRIPT_PATH}/contributors.yml" contributors_yaml = self._load_yaml_file(path) @@ -97,7 +104,7 @@ def delete_inactive_contributors(self, users_to_delete): contributors_yaml["contributors"] = [c for c in contributors_yaml["contributors"] if c.lower() not in users_to_delete_lower] self._write_yaml_file(path, contributors_yaml) - def get_inactive_users_msg(self, users_to_delete, tagusers): + def get_inactive_users_msg(self, users_to_delete, inactive_users_by_wg, tagusers): rfc = ( "https://github.com/cloudfoundry/community/blob/main/toc/rfc/" "rfc-0025-define-criteria-and-removal-process-for-inactive-members.md" @@ -107,9 +114,7 @@ def get_inactive_users_msg(self, users_to_delete, tagusers): "criteria-and-removal-process-for-inactive-members.md#remove-the-membership-to-the-cloud-foundry-github-organization" ) - rfc_promotion_rules = ( - "https://github.com/cloudfoundry/community/blob/main/toc/rfc/rfc-0008-role-change-process.md#proposal" - ) + rfc_promotion_rules = "https://github.com/cloudfoundry/community/blob/main/toc/rfc/rfc-0008-role-change-process.md#proposal" user_tagging_prefix = "@" if tagusers else "" users_as_list = "\n".join(str(user_tagging_prefix + s) for s in users_to_delete) @@ -120,8 +125,18 @@ def get_inactive_users_msg(self, users_to_delete, tagusers): "and open a new pull-request to be re-added as contributor after this one is merged.\n" f"As alternative, if you are active in a working group please check the [promotion rules]({rfc_promotion_rules})\n" "and if you are eligible and wish apply for a role in that working group." + f"{self._get_inactive_users_msg_for_wgs(inactive_users_by_wg, user_tagging_prefix)}" ) + def get_inactive_users_by_wg(self, community_members_with_role_by_wg): + result = dict() + for wg in community_members_with_role_by_wg.keys(): + wg_members = community_members_with_role_by_wg[wg] + wg_inactive_users = inactive_users.intersection(wg_members) + if len(wg_inactive_users) != 0 and wg != "Admin": + result[wg] = wg_inactive_users + return result + @staticmethod def _get_bool_env_var(env_var_name, default): return os.getenv(env_var_name, default).lower() == "true" @@ -154,7 +169,10 @@ def _get_bool_env_var(env_var_name, default): print("Get information about community users") generator = OrgGenerator() generator.load_from_project() - community_members_with_role = generator.get_community_members_with_role() + community_members_with_role_by_wg = generator.get_community_members_with_role_by_wg() + community_members_with_role = set() + for members in community_members_with_role_by_wg.values(): + community_members_with_role |= set(members) print("Analyzing Cloud Foundry org user activity.") userHandler = InactiveUserHandler(args.githuborg, args.githuborgid, args.sincedate, args.githubtoken) @@ -163,16 +181,15 @@ def _get_bool_env_var(env_var_name, default): print(f"Inactive users length is {len(inactive_users)} and inactive users are {inactive_users}") users_to_delete = inactive_users - community_members_with_role tagusers = args.tagusers or InactiveUserHandler._get_bool_env_var("INACTIVE_USER_MANAGEMENT_TAG_USERS", "False") - inactive_users_msg = userHandler.get_inactive_users_msg(users_to_delete, tagusers) + inactive_users_by_wg = userHandler.get_inactive_users_by_wg(community_members_with_role_by_wg) + inactive_users_msg = userHandler.get_inactive_users_msg(users_to_delete, inactive_users_by_wg, tagusers) if args.dryrun or InactiveUserHandler._get_bool_env_var("INACTIVE_USER_MANAGEMENT_DRY_RUN", "False"): print(f"Dry-run mode.\nInactive_users_msg is: {inactive_users_msg}") print(f"Following users will be deleted: {inactive_users}") + print(f"Inactive users by wg are {inactive_users_by_wg}") elif users_to_delete: userHandler.delete_inactive_contributors(users_to_delete) with open(os.environ["GITHUB_OUTPUT"], "a") as env: separator = uuid.uuid1() step_output_name = "inactive_users_pr_description" print(f"{step_output_name}<<{separator}\n{inactive_users_msg}\n{separator}", file=env) - - inactive_users_with_role = community_members_with_role.intersection(inactive_users) - print(f"Inactive users with role length is {len(inactive_users_with_role)} and users are {inactive_users_with_role}") From 8965767acf7c2da0170d315d29722680269d1159 Mon Sep 17 00:00:00 2001 From: Beyhan Veli Date: Fri, 5 Jul 2024 13:47:30 +0200 Subject: [PATCH 10/16] Remove some new lines from PR description & small refactorings --- org/org_management.py | 3 +-- org/org_user_management.py | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/org/org_management.py b/org/org_management.py index 2e6aa7cc..d596dbc7 100644 --- a/org/org_management.py +++ b/org/org_management.py @@ -89,8 +89,7 @@ def get_contributors(self) -> Set[str]: return set(self.contributors) def get_community_members_with_role_by_wg(self) -> Dict[str, Set[str]]: - result = dict() - result["toc"] = set(self.toc) + result = {"toc": set(self.toc)} for wg in self.working_groups: result[wg["name"]] = OrgGenerator._wg_github_users(wg) return result diff --git a/org/org_user_management.py b/org/org_user_management.py index 065d3d70..88baf6ec 100644 --- a/org/org_user_management.py +++ b/org/org_user_management.py @@ -91,9 +91,9 @@ def _write_yaml_file(self, path, data): yaml.dump(data, f) def _get_inactive_users_msg_for_wgs(self, inactive_users_by_wg, user_tagging_prefix): - result = "" if len(inactive_users_by_wg.keys()) == 0 else "\n\nWarning:\n" - for wg in inactive_users_by_wg.keys(): - wg_users_as_list = "\n".join(str(user_tagging_prefix + s) for s in inactive_users_by_wg[wg]) + result = "\n\nWarning:\n" if inactive_users_by_wg else "" + for wg, users in inactive_users_by_wg.items(): + wg_users_as_list = "\n".join(str(user_tagging_prefix + s) for s in users) result += f'Inactive users of Working Group "{wg}" are: \n{wg_users_as_list}\n' return result @@ -121,20 +121,19 @@ def get_inactive_users_msg(self, users_to_delete, inactive_users_by_wg, tagusers return ( f"According to the rules for inactivity defined in [RFC-0025]({rfc}) following users will be deleted:\n" f"{users_as_list}\nAccording to the [revocation policy in the RFC]({rfc_revocation_rules}), users have" - " two weeks to refute this revocation, if they wish by commenting on this pull-request\n" + " two weeks to refute this revocation, if they wish by commenting on this pull-request " "and open a new pull-request to be re-added as contributor after this one is merged.\n" - f"As alternative, if you are active in a working group please check the [promotion rules]({rfc_promotion_rules})\n" + f"As alternative, if you are active in a working group please check the [promotion rules]({rfc_promotion_rules}) " "and if you are eligible and wish apply for a role in that working group." f"{self._get_inactive_users_msg_for_wgs(inactive_users_by_wg, user_tagging_prefix)}" ) - def get_inactive_users_by_wg(self, community_members_with_role_by_wg): + def get_inactive_users_by_wg(self, inactive_users, community_members_with_role_by_wg): result = dict() - for wg in community_members_with_role_by_wg.keys(): - wg_members = community_members_with_role_by_wg[wg] - wg_inactive_users = inactive_users.intersection(wg_members) - if len(wg_inactive_users) != 0 and wg != "Admin": - result[wg] = wg_inactive_users + for wg, members in community_members_with_role_by_wg.items(): + wg_inactive_members = inactive_users.intersection(members) + if len(wg_inactive_members) != 0 and wg != "Admin": + result[wg] = wg_inactive_members return result @staticmethod @@ -181,7 +180,7 @@ def _get_bool_env_var(env_var_name, default): print(f"Inactive users length is {len(inactive_users)} and inactive users are {inactive_users}") users_to_delete = inactive_users - community_members_with_role tagusers = args.tagusers or InactiveUserHandler._get_bool_env_var("INACTIVE_USER_MANAGEMENT_TAG_USERS", "False") - inactive_users_by_wg = userHandler.get_inactive_users_by_wg(community_members_with_role_by_wg) + inactive_users_by_wg = userHandler.get_inactive_users_by_wg(inactive_users, community_members_with_role_by_wg) inactive_users_msg = userHandler.get_inactive_users_msg(users_to_delete, inactive_users_by_wg, tagusers) if args.dryrun or InactiveUserHandler._get_bool_env_var("INACTIVE_USER_MANAGEMENT_DRY_RUN", "False"): print(f"Dry-run mode.\nInactive_users_msg is: {inactive_users_msg}") From 7ada99335e3df43dee95fe53fe4fccf58e0bca55 Mon Sep 17 00:00:00 2001 From: Pavel Busko Date: Thu, 13 Jun 2024 11:07:12 +0200 Subject: [PATCH 11/16] Enable branch protection for the cnbapplifecycle repo Co-authored-by: Johannes Dillmann --- org/branchprotection.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/org/branchprotection.yml b/org/branchprotection.yml index aa081d9e..e118f8ff 100644 --- a/org/branchprotection.yml +++ b/org/branchprotection.yml @@ -195,3 +195,21 @@ branch-protection: protect: false buildpacks-envs: protect: false + + cnbapplifecycle: + allow_deletions: false + allow_disabled_policies: true + allow_force_pushes: false + enforce_admins: true + include: ["^main$"] + protect: true + required_status_checks: + contexts: + - "Go / unit (pull_request)" + - "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 From d927529e98e104d304a433308341503e9bbf8170 Mon Sep 17 00:00:00 2001 From: Philipp Thun Date: Fri, 12 Jul 2024 09:32:17 +0200 Subject: [PATCH 12/16] Add temporary capi-admins team --- org/cloudfoundry.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/org/cloudfoundry.yml b/org/cloudfoundry.yml index e871b5f5..72164139 100644 --- a/org/cloudfoundry.yml +++ b/org/cloudfoundry.yml @@ -2599,3 +2599,12 @@ orgs: cf_exporter: admin firehose_exporter: admin bosh_exporter: admin + temp-ari-capi-admins: + description: "Temporary admin team for CAPI" + maintainers: + - philippthun + - johha + members: [] + privacy: closed + repos: + cloud_controller_ng: admin From 3a2ff33bcb1441ef0f38bc454c5b68ec6d5d444d Mon Sep 17 00:00:00 2001 From: Rob Dimsdale-Zucker Date: Mon, 15 Jul 2024 08:54:41 -0700 Subject: [PATCH 13/16] Add all buildpacks members to all buildpacks repos - there are fewer buildpacks maintainers now so we all need to have access to everything to minimize the impact of any individual being unavailable. --- toc/working-groups/app-runtime-interfaces.md | 76 +++++++++++++++++--- 1 file changed, 67 insertions(+), 9 deletions(-) diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md index 7e9d9a00..d542ec43 100644 --- a/toc/working-groups/app-runtime-interfaces.md +++ b/toc/working-groups/app-runtime-interfaces.md @@ -76,18 +76,28 @@ areas: - name: Buildpacks Docs approvers: + - name: Arjun Sreedharan + github: arjun024 - name: Forest Eckhardt github: ForestEckhardt + - name: Rob Dimsdale-Zucker + github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/docs-buildpacks - cloudfoundry/example-sidecar-buildpack - name: Buildpacks Go approvers: + - name: Arjun Sreedharan + github: arjun024 - name: Forest Eckhardt github: ForestEckhardt - name: Rob Dimsdale-Zucker github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/go-buildpack - cloudfoundry/go-buildpack-release @@ -120,8 +130,12 @@ areas: - name: Buildpacks .Net Core approvers: + - name: Arjun Sreedharan + github: arjun024 - name: Forest Eckhardt github: ForestEckhardt + - name: Rob Dimsdale-Zucker + github: robdimsdale - name: Sophie Wigmore github: sophiewigmore repositories: @@ -130,8 +144,12 @@ areas: - name: Buildpacks .NET Framework approvers: + - name: Arjun Sreedharan + github: arjun024 - name: Forest Eckhardt github: ForestEckhardt + - name: Rob Dimsdale-Zucker + github: robdimsdale - name: Sophie Wigmore github: sophiewigmore repositories: @@ -140,54 +158,84 @@ areas: - name: Buildpacks Node.js approvers: + - name: Arjun Sreedharan + github: arjun024 + - name: Forest Eckhardt + github: ForestEckhardt - name: Rob Dimsdale-Zucker - github: robdimsdale + github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/nodejs-buildpack - cloudfoundry/nodejs-buildpack-release - name: Buildpacks PHP approvers: - - name: Sophie Wigmore - github: sophiewigmore - name: Arjun Sreedharan github: arjun024 + - name: Forest Eckhardt + github: ForestEckhardt + - name: Rob Dimsdale-Zucker + github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/php-buildpack - cloudfoundry/php-buildpack-release - name: Buildpacks Python approvers: + - name: Arjun Sreedharan + github: arjun024 + - name: Forest Eckhardt + github: ForestEckhardt - name: Rob Dimsdale-Zucker github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/python-buildpack - cloudfoundry/python-buildpack-release - name: Buildpacks R approvers: + - name: Arjun Sreedharan + github: arjun024 + - name: Forest Eckhardt + github: ForestEckhardt - name: Rob Dimsdale-Zucker github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/r-buildpack - cloudfoundry/r-buildpack-release - name: Buildpacks Ruby approvers: - - name: Sophie Wigmore - github: sophiewigmore + - name: Arjun Sreedharan + github: arjun024 + - name: Forest Eckhardt + github: ForestEckhardt - name: Rob Dimsdale-Zucker github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/ruby-buildpack - cloudfoundry/ruby-buildpack-release - name: Buildpacks Stacks approvers: - - name: Sophie Wigmore - github: sophiewigmore + - name: Arjun Sreedharan + github: arjun024 + - name: Forest Eckhardt + github: ForestEckhardt - name: Rob Dimsdale-Zucker github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/cflinuxfs4 - cloudfoundry/cflinuxfs4-compat-release @@ -196,12 +244,14 @@ areas: - name: Buildpacks Tooling approvers: + - name: Arjun Sreedharan + github: arjun024 - name: Forest Eckhardt github: ForestEckhardt - - name: Sophie Wigmore - github: sophiewigmore - name: Rob Dimsdale-Zucker github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/binary-builder - cloudfoundry/brats @@ -225,6 +275,10 @@ areas: github: ForestEckhardt - name: David O'Sullivan github: pivotal-david-osullivan + - name: Rob Dimsdale-Zucker + github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore reviewers: - name: Anthony Dahanne github: anthonydahanne @@ -239,6 +293,10 @@ areas: github: arjun024 - name: Forest Eckhardt github: ForestEckhardt + - name: Rob Dimsdale-Zucker + github: robdimsdale + - name: Sophie Wigmore + github: sophiewigmore repositories: - cloudfoundry/nginx-buildpack - cloudfoundry/nginx-buildpack-release From e6bcdaed8f01fb39baf9934c5b7374808cce1a43 Mon Sep 17 00:00:00 2001 From: Sam Gunaratne Date: Mon, 15 Jul 2024 10:50:33 -0600 Subject: [PATCH 14/16] Add samze as CLI approver --- toc/working-groups/app-runtime-interfaces.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toc/working-groups/app-runtime-interfaces.md b/toc/working-groups/app-runtime-interfaces.md index 7e9d9a00..0c081964 100644 --- a/toc/working-groups/app-runtime-interfaces.md +++ b/toc/working-groups/app-runtime-interfaces.md @@ -340,6 +340,8 @@ areas: github: dalvarado - name: João Pereira github: joaopapereira + - name: Sam Gunaratne + github: samze reviewers: - name: George Gelashvili github: pivotalgeorge @@ -347,8 +349,6 @@ areas: github: PeteLevineA - name: Tim Downey github: tcdowney - - name: Sam Gunaratne - github: samze - name: Michael Chinigo github: chinigo - name: Greg Weresch From 63ab3918c64dea4fde7288d53e15d7328c7265da Mon Sep 17 00:00:00 2001 From: Plamen Dimov Doychev Date: Thu, 18 Jul 2024 15:18:20 +0300 Subject: [PATCH 15/16] Update rfc-0030-add-support-for-file-based-service-binding.md Updating the RFC document as it contradicts with the servicebinding.io spec. Most probably leftover from the discussion phase. --- .../rfc-0030-add-support-for-file-based-service-binding.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toc/rfc/rfc-0030-add-support-for-file-based-service-binding.md b/toc/rfc/rfc-0030-add-support-for-file-based-service-binding.md index ece4facf..9bf9942c 100644 --- a/toc/rfc/rfc-0030-add-support-for-file-based-service-binding.md +++ b/toc/rfc/rfc-0030-add-support-for-file-based-service-binding.md @@ -33,7 +33,7 @@ The two approaches should be supported in parallel. Users should be able to sele * Less implementation effort for the Cloud Controller * Disadvantages: * Can’t make use of tools and libraries from the Cloud Native community because K8s specifies a different file structure and format for the service binding information -2. Implement the K8s service binding specification. The environment variable `SERVICE_BINDING_ROOT` defines the location for the service bindings. There is a file per service binding. The name of the file and the format follow the [K8s specification](https://servicebinding.io/): +2. Implement the K8s service binding specification. The environment variable `SERVICE_BINDING_ROOT` defines the location for the service bindings. The name of the file and the format follow the [K8s specification](https://servicebinding.io/): * Advantages: * CF community could re-use service binding libraries from the Cloud Native community * Moving application between CF or K8s deployments will be easier @@ -64,7 +64,7 @@ action := &models.RunAction{ Value: "ENVVALUE", }, }, - Files: []*models.Files{ + ServiceBindingFiles: []*models.Files{ { Name: "/etc/cf-instance-binding", Value: "VALUE", From 51a96d684a370f789f6d6a156839cf021c713300 Mon Sep 17 00:00:00 2001 From: d037539m Date: Thu, 18 Jul 2024 15:07:50 +0200 Subject: [PATCH 16/16] add oliver heinrich as new member --- org/contributors.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/org/contributors.yml b/org/contributors.yml index 6104d0e4..da563a1a 100644 --- a/org/contributors.yml +++ b/org/contributors.yml @@ -150,6 +150,7 @@ contributors: - nouseforaname - nvvalchev - ohkyle +- oliver-heinrich - oppegard - pabloarodas - paketo-bot