Merge pull request etcd-io#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.
 

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 <[email protected]> <[email protected]>
+  - jmhbnz           # James Blair <[email protected]> <[email protected]>
+  - serathius        # Marek Siarkowicz <[email protected]> <[email protected]>
+  - spzala           # Sahdev Zala <[email protected]>
+  - wenjiaswe        # Wenjia Zhang <[email protected]> <[email protected]>
 reviewers:
-- heyitsanthony
-- philips
-- fanminshi
-- gyuho
-- mitake
-- jpbetz
-- xiang90
-- wenjiaswe
-- jingyih
-- hexfusion
+  - fuweid           # Wei Fu <[email protected]>
+  - ivanvc           # Ivan Valdes <[email protected]>
+  - siyuanfoundation # Siyuan Zhang <[email protected]> <[email protected]>

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