From 0bc62cd449587e72fa5dac2e8e94968880d7a1ce Mon Sep 17 00:00:00 2001 From: James Blair Date: Wed, 18 Oct 2023 17:09:48 +1300 Subject: [PATCH] Complete migration to owners file. Signed-off-by: James Blair --- CONTRIBUTING.md | 2 +- .../contributor-guide/community-membership.md | 18 ++++++++-------- Documentation/infra-guide/arm64-infra.md | 6 +++--- GOVERNANCE.md | 2 +- MAINTAINERS | 21 ------------------- README.md | 2 +- 6 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 MAINTAINERS diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ddeb77a46801..32fef6270718 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,7 @@ If any of aforementioned labels don't have unassigned issues, please [contact] o [github issue tracker]: https://github.com/etcd-io/etcd/issues [good first issue]: https://github.com/search?type=issues&q=org%3Aetcd-io+state%3Aopen++label%3A%22good+first+issue%22 [help wanted]: https://github.com/search?type=issues&q=org%3Aetcd-io+state%3Aopen++label%3A%22help+wanted%22 -[maintainers]: https://github.com/etcd-io/etcd/blob/main/MAINTAINERS +[maintainers]: https://github.com/etcd-io/etcd/blob/main/OWNERS [priority/important]: https://github.com/search?type=issues&q=org%3Aetcd-io+state%3Aopen++label%3A%22priority%2Fimportant%22 ## Setup development environment diff --git a/Documentation/contributor-guide/community-membership.md b/Documentation/contributor-guide/community-membership.md index 946f7a9f65f1..d9dff542bfce 100644 --- a/Documentation/contributor-guide/community-membership.md +++ b/Documentation/contributor-guide/community-membership.md @@ -2,11 +2,11 @@ This doc outlines the various responsibilities of contributor roles in etcd. -| Role | Responsibilities | Requirements | Defined by | -|------------|----------------------------------------------|---------------------------------------------------------------|--------------------------------------| -| Member | Active contributor in the community | Sponsored by 2 reviewers and multiple contributions | etcd GitHub org member | -| Reviewer | Review contributions from other members | History of review and authorship | [MAINTAINERS] file reviewer entry | -| Maintainer | Set direction and priorities for the project | Demonstrated responsibility and excellent technical judgement | [MAINTAINERS] file maintainers entry | +| Role | Responsibilities | Requirements | Defined by | +|------------|----------------------------------------------|---------------------------------------------------------------|-------------------------------| +| Member | Active contributor in the community | Sponsored by 2 reviewers and multiple contributions | etcd GitHub org member | +| Reviewer | Review contributions from other members | History of review and authorship | [OWNERS] file reviewer entry | +| Maintainer | Set direction and priorities for the project | Demonstrated responsibility and excellent technical judgement | [OWNERS] file approver entry | ## New contributors @@ -69,7 +69,7 @@ the codebase and software engineering principles. Their LGTM counts towards merging a code change into the project. A reviewer is generally on the ladder towards maintainership. -**Defined by:** *reviewers* entry in the [MAINTAINERS] file. +**Defined by:** *reviewers* entry in the [OWNERS] file. ### Requirements @@ -101,7 +101,7 @@ are committed to the long term success of a project. Maintainership is about bui trust with the current maintainers and being a person that they can depend on to make decisions in the best interest of the project in a consistent manner. -**Defined by:** *maintainers* entry in the [MAINTAINERS] file. +**Defined by:** *approvers* entry in the [OWNERS] file. ### Requirements @@ -119,7 +119,7 @@ depend on to make decisions in the best interest of the project in a consistent - Include a list of contributions representative of your work on the project. - Existing maintainers vote will privately and respond to the email with either acceptance or with feedback for suggested improvement. - With your membership approved you are expected to: - - Open a PR and add an entry to the [MAINTAINERS] file + - Open a PR and add an entry to the [OWNERS] file - Subscribe to etcd-maintainers@googlegroups.com and etcd-maintainers-private@googlegroups.com - Request to join to [etcd-maintainer teams of etcd organization of GitHub](https://github.com/orgs/etcd-io/teams/maintainers-etcd) - Request to join to the private slack channel for etcd maintainers on [kubernetes slack](http://slack.kubernetes.io/) @@ -159,7 +159,7 @@ of at least two active maintainers. Contributor roles and responsibilities were written based on [Kubernetes community membership] -[MAINTAINERS]: /MAINTAINERS +[OWNERS]: /OWNERS [contributor guide]: /CONTRIBUTING.md [membership nomination]:https://github.com/etcd-io/etcd/issues/new?assignees=&labels=area%2Fcommunity&template=membership-request.yml [Kubernetes community membership]: https://github.com/kubernetes/community/blob/master/community-membership.md diff --git a/Documentation/infra-guide/arm64-infra.md b/Documentation/infra-guide/arm64-infra.md index 90b35fde384b..82e6d104cf54 100644 --- a/Documentation/infra-guide/arm64-infra.md +++ b/Documentation/infra-guide/arm64-infra.md @@ -23,11 +23,11 @@ Access to the infrastructure is defined by the infra admins table below: | Name | Github | K8s Slack | Email | |---------------------------|----------------|--------------------|--------------------| -| Marek Siarkowicz | @serathius | @ Serathius | Ref MAINTAINERS | -| Benjamin Wang | @ahrtr | @ Benjamin Wang | Ref MAINTAINERS | +| Marek Siarkowicz | @serathius | @ Serathius | Ref OWNERS | +| Benjamin Wang | @ahrtr | @ Benjamin Wang | Ref OWNERS | | Davanum Srinivas | @dims | @ Dims | davanum@gmail.com | | Chao Chen | @chaochn47 | @ Chao Chen | chaochn@amazon.com | -| James Blair | @jmhbnz | @ James Blair | Ref MAINTAINERS | +| James Blair | @jmhbnz | @ James Blair | Ref OWNERS | Individuals in this table are granted access to the infrastructure in two ways: diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 799d5fd5468c..6573d2f0194e 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -39,4 +39,4 @@ Changes in project governance could be initiated by opening a GitHub PR. [community membership]: /Documentation/contributor-guide/community-membership.md [Code of Conduct]: /code-of-conduct.md [contributor guide]: /CONTRIBUTING.md -[maintainers]: /MAINTAINERS +[maintainers]: /OWNERS diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 50d49418b420..000000000000 --- a/MAINTAINERS +++ /dev/null @@ -1,21 +0,0 @@ -# The official list of maintainers and reviewers for the project maintenance. -# -# Refer to the https://github.com/etcd-io/etcd/blob/main/Documentation/contributor-guide/community-membership.md for description of the roles. -# -# Names should be added to this file like so: -# Individual's name (@GITHUB_HANDLE) pkg:* -# Individual's name (@GITHUB_HANDLE) pkg:* -# -# Please keep the list sorted. - -# MAINTAINERS -Benjamin Wang (@ahrtr) pkg:* -Hitoshi Mitake (@mitake) pkg:* -Marek Siarkowicz (@serathius) pkg:* -Piotr Tabor (@ptabor) pkg:* -Sahdev Zala (@spzala) pkg:* -Wenjia Zhang (@wenjiaswe) pkg:* - -# REVIEWERS -James Blair (@jmhbnz) pkg:* -Wei Fu (@fuweid) pkg:* diff --git a/README.md b/README.md index 80296cf40f34..b2a401be8be2 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ See [etcdctl][etcdctl] for a simple command line client. ## Maintainers -[MAINTAINERS](MAINTAINERS) strive to shape an inclusive open source project culture where users are heard and contributors feel respected and empowered. MAINTAINERS maintain productive relationships across different companies and disciplines. Read more about [MAINTAINERS role and responsibilities](Documentation/contributor-guide/community-membership.md#maintainers). +[Maintainers](OWNERS) strive to shape an inclusive open source project culture where users are heard and contributors feel respected and empowered. Maintainers aim to build productive relationships across different companies and disciplines. Read more about [Maintainers role and responsibilities](Documentation/contributor-guide/community-membership.md#maintainers). ## Getting started