Merge pull request #18448 from thedtripp/backportOwnersFile2

Complete backport of OWNERS file.

CONTRIBUTING.md

@@ -25,7 +25,7 @@ This is a rough outline of what a contributor's workflow looks like:
 - Make sure commit messages are in the proper format (see below).
 - Push changes in a topic branch to a personal fork of the repository.
 - Submit a pull request to etcd-io/etcd.
-- The PR must receive a LGTM from two maintainers found in the MAINTAINERS file.
+- The PR must receive a LGTM from two maintainers found in the OWNERS file.
 
 Thanks for contributing!
 

Documentation/op-guide/supported-platform.md

@@ -16,7 +16,7 @@ The following table lists etcd support status for common architectures and opera
 | 386          | Linux            | Unstable     |                             |
 | ppc64le      | Linux            | Stable       | etcd maintainers, @mkumatag |
 
-* etcd-maintainers are listed in https://github.com/etcd-io/etcd/blob/master/MAINTAINERS.
+* etcd-maintainers are listed in https://github.com/etcd-io/etcd/blob/master/OWNERS.
 
 Experimental platforms appear to work in practice and have some platform specific code in etcd, but do not fully conform to the stable support policy. Unstable platforms have been lightly tested, but less than experimental. Unlisted architecture and operating system pairs are currently unsupported; caveat emptor.
 

MAINTAINERS

@@ -1,18 +0,0 @@
-# This is the official list of etcd maintainers.
-#
-# Names should be added to this file like so:
-#     Individual's name <submission email address> (@GITHUB_HANDLE) pkg:*
-#     Individual's name <submission email address> <email2> <emailN> (@GITHUB_HANDLE) pkg:*
-#
-# Please keep the list sorted.
-
-Brandon Philips <bphilips@redhat.com> (@philips) pkg:*
-Gyuho Lee <gyuhox@gmail.com> <leegyuho@amazon.com> (@gyuho) pkg:*
-Hitoshi Mitake <h.mitake@gmail.com> (@mitake) pkg:*
-Jingyi Hu <jingyih@google.com> (@jingyih) pkg:*
-Joe Betz <jpbetz@google.com> (@jpbetz) pkg:*
-Sahdev Zala <spzala@us.ibm.com> (@spzala) pkg:*
-Sam Batschelet <sbatsche@redhat.com> (@hexfusion) pkg:*
-Xiang Li <xiangli.cs@gmail.com> (@xiang90) pkg:*
-
-Ben Darnell <ben@cockroachlabs.com> (@bdarnell) pkg:go.etcd.io/etcd/raft

MAINTAINERS_RULES.md

@@ -1,16 +0,0 @@
-
-This document describes basic expectations for maintainers. To become a maintainer, start taking on these responsibilities. Consistent contributors then discuss with existing maintainers to become the official [MAINTAINERS](./MAINTAINERS).
-
-### Top-level maintainer
-
-- Running the etcd release processes
-- Ownership of test and debug infrastructure
-- Resolve or redirect issues to keep the issue count low (goal: under 100)
-- Regularly review pull requests across all pkgs
-- Providing cross pkg design review
-
-### Package/feature maintainer
-
-- Ownership of test and debug failures in a pkg/feature
-- Resolution of bugs triaged to a package/feature
-- Regularly review pull requests to the pkg subsystem

OWNERS

@@ -1,20 +1,12 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
-- heyitsanthony
-- philips
-- fanminshi
-- gyuho
-- mitake
-- jpbetz
-- xiang90
-- hexfusion
+  - ahrtr            # Benjamin Wang <benjamin.ahrtr@gmail.com> <benjamin.wang@broadcom.com>
+  - jmhbnz           # James Blair <jablair@redhat.com> <mail@jamesblair.net>
+  - serathius        # Marek Siarkowicz <siarkowicz@google.com> <marek.siarkowicz@gmail.com>
+  - spzala           # Sahdev Zala <spzala@us.ibm.com>
+  - wenjiaswe        # Wenjia Zhang <wenjiazhang@google.com> <wenjia.swe@gmail.com>
 reviewers:
-- heyitsanthony
-- philips
-- fanminshi
-- gyuho
-- mitake
-- jpbetz
-- xiang90
-- wenjiaswe
-- jingyih
-- hexfusion
+  - fuweid           # Wei Fu <fuweid89@gmail.com>
+  - ivanvc           # Ivan Valdes <ivan@vald.es>
+  - siyuanfoundation # Siyuan Zhang <sizhang@google.com> <physicsbug@gmail.com>

README.md

@@ -171,7 +171,7 @@ See [reporting bugs](Documentation/reporting_bugs.md) for details about reportin
 
 ## Reporting a security vulnerability
 
-A security vulnerability can be reported as an issue, however, GitHub and mailing lists may NOT always be an appropriate place for reporting vulnerabilities. In that case, please reach out to the project [MAINTAINERS](https://github.com/etcd-io/etcd/blob/master/MAINTAINERS) to first discuss the vulnerabilities with them and take necessary action per such discussion.
+A security vulnerability can be reported as an issue, however, GitHub and mailing lists may NOT always be an appropriate place for reporting vulnerabilities. In that case, please reach out to the project [MAINTAINERS](https://github.com/etcd-io/etcd/blob/master/OWNERS) to first discuss the vulnerabilities with them and take necessary action per such discussion.
 
 ## Issue and PR management