Adopt Linkerd's governance (linkerd#1301)

mackjmr · Jul 10, 2018 · dbb3270 · dbb3270
1 parent 941cad4
commit dbb3270
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 2 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,3 @@
-# William and Oliver should approve all changelog entries.
-CHANGES.md @wmorgan @olix0r
+CHANGES.md @wmorgan @klingerf @olix0r
+GOVERNANCE.md @klingerf @olix0r
+MAINTAINERS.md @klingerf @olix0r
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -0,0 +1,48 @@
+# Linkerd Governance
+
+This document defines project governance for Linkerd.
+
+## Roles
+
+There are two roles that convey decision-making powers: maintainer and
+super-maintainer. MAINTAINERS.md defines the membership of these roles.
+
+## Expectations
+
+Maintainers are responsible for one or more components, and are expected to
+contribute code, field incoming PRs, triage issues, proactively fix bugs, and
+generally perform maintainance tasks for these components.
+
+Super-maintainers are responsible for the project as a whole, and are expected
+to guide general project direction as well as being the final reviewer on PRs.
+
+## Decisionmaking
+
+Ideally, all project decisions are resolved by consensus. If this is not
+possible, maintainers may call a vote. Unless otherwise specified in this
+document, the vote will be decided by a simple majority in which each
+super-maintainer receives two votes and each maintainer receives one vote.
+
+## Changes in Maintainership
+
+New maintainers must be proposed by an existing maintainer and must be elected
+by a 2/3 majority organization vote. Maintainers can be removed by a 2/3
+majority organization vote.
+
+Super-maintainers must be proposed by an existing super-maintainer and must be
+elected by a 2/3 majority organization vote. Super-maintainers can be removed
+by a 2/3 majority organization vote.
+
+## GitHub Project Administration
+
+Maintainers will be added to the linkerd GitHub organization, and be made an
+owner of the GitHub organization.
+
+## Approving PRs
+
+All PRs must receive approval from at least one super maintainer before merge.
+
+## Changes in Governance
+
+All changes in Governance require a 2/3 majority organization vote.
+
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -0,0 +1,17 @@
+The Linkerd2 maintainers are:
+
+* Oliver Gould <ver@buoyant.io> @olix0r (super-maintainer)
+* Kevin Lingerfelt <kl@buoyant.io> @klingerf (super-maintainer)
+* Risha Mars <mars@buoyant.io> @rmars
+* Brian Smith <brian@buoyant.io> @briansmith
+* Andrew Seigner <siggy@buoyant.io> @siggy
+
+<!--
+# Adding a new maintainer
+
+* Submit a PR modifying this file
+* Add maintainer to .github/CODEOWNERS
+* Obtain approvals per GOVERNANCE.md
+* Invite maintainer to https://github.com/orgs/linkerd/teams/linkerd2-maintainers/members
+* Invite maintainer to https://github.com/orgs/linkerd/people
+-->