Merge pull request #112952 from liggitt/root

Make root approvers list non-recursive, shift from individuals to sig/subproject aliases

.github/OWNERS

@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - alisondy
   - cblecker

CHANGELOG/OWNERS

@@ -1,18 +1,21 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
   - release-engineering-approvers
   - release-managers
-  - ramrodo # 1.26 Release Notes Lead
-  - csantanapr # 1.25 Release Notes Lead
   - AuraSinis # 1.24 Release Notes Lead
   - cici37 # 1.23 Release Notes Lead
+  - csantanapr # 1.25 Release Notes Lead
+  - ramrodo # 1.26 Release Notes Lead
 reviewers:
   - release-managers
-  - ramrodo # 1.26 Release Notes Lead
   - AnaMMedina21 # 1.26 Release Notes Shadow
   - harshanarayana # 1.26 Release Notes Shadow
   - laxmikantbpandhare # 1.26 Release Notes Shadow
+  - ramrodo # 1.26 Release Notes Lead
   - sayantani11 # 1.26 Release Notes Shadow
 labels:
   - sig/release

LICENSES/OWNERS

@@ -1,4 +1,7 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
   - dep-approvers

OWNERS

@@ -3,23 +3,21 @@
 filters:
   ".*":
     reviewers:
-      - dchen1107
+      - dep-reviewers
-      - lavalamp
+      - sig-architecture-approvers
-      - smarterclayton
-      - thockin
-      - wojtek-t
-      - liggitt
     approvers:
+      - dep-approvers # for go.mod/go.sum
+      - sig-architecture-approvers # for OWNERS_ALIASES and other root files
+    emeritus_approvers:
+      - bgrant0607
+      - brendandburns
       - dchen1107
+      - jbeda
       - lavalamp
+      - liggitt
       - smarterclayton
       - thockin
       - wojtek-t
-      - liggitt
-    emeritus_approvers:
-      - brendandburns
-      - bgrant0607
-      - jbeda
   # go.{mod,sum} files relate to go dependencies, and should be reviewed by the
   # dep-approvers
   "go\\.(mod|sum)$":

OWNERS_ALIASES

@@ -1,4 +1,6 @@
 aliases:
+  # Note: sig-architecture-approvers has approval on root files (including go.mod/go.sum) until https://github.com/kubernetes/test-infra/pull/21398 is resolved.
+  # People with approve rights via this alias should defer dependency update PRs to dep-approvers.
   sig-architecture-approvers:
     - dims
     - derekwaynecarr
@@ -462,6 +464,8 @@ aliases:
     - jayunit100
     - jsturtevant
     - marosset
+  # Note: dep-approvers has approval on root files (including OWNERS_ALIASES) until https://github.com/kubernetes/test-infra/pull/21398 is resolved.
+  # People with approve rights via this alias should defer updates of root files other than go.mod/go.sum to dep-approvers.
   dep-approvers:
     - BenTheElder
     - cblecker

build/OWNERS

@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - bentheelder
   - cblecker
@@ -8,10 +11,12 @@ reviewers:
   - jeremyrickard # SIG Technical Lead / RelEng subproject owner
   #- justaugustus # SIG Chair / RelEng subproject owner / Release Manager - approvals only
   - lavalamp
+  - liggitt
   - palnabarun # Release Manager
   - puerco # SIG Technical Lead / RelEng subproject owner / Release Manager
   - saschagrunert # SIG Chair / RelEng subproject owner / Release Manager
   - spiffxp
+  - thockin
   - Verolop # Release Manager
   - xmudrii # Release Manager
 approvers:
@@ -20,8 +25,10 @@ approvers:
   - dims
   - justaugustus
   - lavalamp
+  - liggitt
   - mikedanese
   - spiffxp
+  - thockin
 emeritus_approvers:
   - fejta
   - jbeda

cluster/OWNERS

@@ -1,18 +1,25 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - bentheelder
   - cheftako
   - dims
   - justaugustus
+  - liggitt
   - mikedanese
   - spiffxp
+  - wojtek-t
 approvers:
   - bentheelder
   - cheftako
   - dims
+  - liggitt
   - mikedanese
   - spiffxp
+  - wojtek-t
 emeritus_approvers:
   - eparis
   - roberthbailey # 2019-03-08

cmd/OWNERS

@@ -1,14 +1,23 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - dchen1107
-  - lavalamp
-  - mikedanese
-  - thockin
   - dims
+  - lavalamp
+  - liggitt
+  - mikedanese
+  - smarterclayton
+  - thockin
+  - wojtek-t
 approvers:
   - dchen1107
-  - lavalamp
-  - mikedanese
-  - thockin
   - dims
+  - lavalamp
+  - liggitt
+  - mikedanese
+  - smarterclayton
+  - thockin
+  - wojtek-t

docs/OWNERS

@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - smarterclayton
   - thockin

hack/OWNERS

@@ -1,29 +1,41 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - bentheelder
   - cblecker
+  - dchen1107
   - hwdef
   - justaugustus
   - lavalamp
+  - liggitt
+  - mikedanese
   - SataQiu
+  - smarterclayton
   - spiffxp
   - sttts
-  - mikedanese
+  - thockin
+  - wojtek-t
 approvers:
   - bentheelder
   - cblecker
+  - dchen1107
   - deads2k
   - dims # for local-up-cluster related files
   - enj # for sig-auth related stuff like cert testdata
   - lavalamp
   - liggitt
+  - mikedanese
   - pwittrock
   - SataQiu
+  - smarterclayton
   - soltysh # for sig-cli related stuff
   - spiffxp
   - sttts
-  - mikedanese
+  - thockin
+  - wojtek-t
 emeritus_approvers:
   - eparis
   - fejta

hack/update-vendor.sh

@@ -419,6 +419,9 @@ rm -f "vendor/OWNERS"
 cat <<__EOF__ > "vendor/OWNERS"
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
 - dep-approvers
 reviewers:

logo/OWNERS

@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - thockin
 approvers:

pkg/OWNERS

@@ -1,16 +1,23 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - dchen1107
   - dims
   - lavalamp
+  - liggitt
   - smarterclayton
   - thockin
+  - wojtek-t
 approvers:
   - dchen1107
   - dims
   - lavalamp
+  - liggitt
   - smarterclayton
   - thockin
+  - wojtek-t
 emeritus_approvers:
   - brendandburns

plugin/OWNERS

@@ -1,15 +1,24 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
-  - dims
   - dchen1107
+  - dims
   - lavalamp
+  - liggitt
+  - smarterclayton
   - thockin
+  - wojtek-t
 approvers:
-  - dims
   - dchen1107
+  - dims
   - lavalamp
+  - liggitt
+  - smarterclayton
   - thockin
+  - wojtek-t
 emeritus_approvers:
   - davidopp
   - brendandburns

staging/OWNERS

@@ -1,16 +1,25 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
+  - dchen1107
   - dims
   - lavalamp
-  - smarterclayton
-reviewers:
-  - dims
-  - lavalamp
-  - smarterclayton
-  - wojtek-t
-  - deads2k
-  - caesarxuchao
-  - mikedanese
   - liggitt
+  - smarterclayton
+  - thockin
+  - wojtek-t
+reviewers:
+  - caesarxuchao
+  - dchen1107
+  - deads2k
+  - dims
+  - lavalamp
+  - liggitt
+  - mikedanese
+  - smarterclayton
   - sttts
+  - thockin
+  - wojtek-t

test/OWNERS

@@ -1,10 +1,19 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - aojea
-  - neolit123
+  - dchen1107
   - johnSchnake
+  - lavalamp
+  - liggitt
+  - neolit123
   - SataQiu
+  - smarterclayton
+  - thockin
+  - wojtek-t
 approvers:
   - andrewsykim
   - aojea
@@ -12,13 +21,15 @@ approvers:
   - bowei # for test/e2e/{dns*,network}.go
   - caseydavenport # for test/e2e/{dns*,network}.go
   - cblecker
-  - dims
+  - dchen1107
-  - MrHohn
   - deads2k
+  - dims
   - enj
   - janetkuo
+  - lavalamp
   - liggitt
   - mikedanese
+  - MrHohn
   - msau42
   - neolit123
   - oomichi
@@ -29,6 +40,8 @@ approvers:
   - smarterclayton
   - soltysh
   - sttts
+  - thockin
+  - wojtek-t
 emeritus_approvers:
   - eparis
   - foxish

third_party/OWNERS

@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 reviewers:
   - dims
   - lavalamp

vendor/OWNERS

@@ -1,5 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
+options:
+  # make root approval non-recursive
+  no_parent_owners: true
 approvers:
 - dep-approvers
 reviewers: