Skip to content

Commit

Permalink
Complete migration to OWNERS file.
Browse files Browse the repository at this point in the history
Signed-off-by: James Blair <[email protected]>
  • Loading branch information
jmhbnz committed Oct 22, 2023
1 parent bbf59a9 commit 97f33be
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions Documentation/contributor-guide/community-membership.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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 [email protected] and [email protected]
- 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/)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Documentation/infra-guide/arm64-infra.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | [email protected] |
| Chao Chen | @chaochn47 | @ Chao Chen | [email protected] |
| 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:

Expand Down
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 97f33be

Please sign in to comment.