From 04b178b49bd35529de40dd84a18ebfd034b22096 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 5 Oct 2022 14:24:21 -0400 Subject: [PATCH 1/4] Make root approval non-recursive --- .github/OWNERS | 3 +++ CHANGELOG/OWNERS | 3 +++ LICENSES/OWNERS | 3 +++ build/OWNERS | 3 +++ cluster/OWNERS | 3 +++ cmd/OWNERS | 3 +++ docs/OWNERS | 3 +++ hack/OWNERS | 3 +++ hack/update-vendor.sh | 3 +++ logo/OWNERS | 3 +++ pkg/OWNERS | 3 +++ plugin/OWNERS | 3 +++ staging/OWNERS | 3 +++ test/OWNERS | 3 +++ third_party/OWNERS | 3 +++ vendor/OWNERS | 3 +++ 16 files changed, 48 insertions(+) diff --git a/.github/OWNERS b/.github/OWNERS index 314620b5052..4080c7bd3a6 100644 --- a/.github/OWNERS +++ b/.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 diff --git a/CHANGELOG/OWNERS b/CHANGELOG/OWNERS index 6e31e3aca29..7bf255b2de4 100644 --- a/CHANGELOG/OWNERS +++ b/CHANGELOG/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: - release-engineering-approvers - release-managers diff --git a/LICENSES/OWNERS b/LICENSES/OWNERS index a939bd068c0..3b4d7090b22 100644 --- a/LICENSES/OWNERS +++ b/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 diff --git a/build/OWNERS b/build/OWNERS index 6e6e5c07d6a..fca6453f1ca 100644 --- a/build/OWNERS +++ b/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 diff --git a/cluster/OWNERS b/cluster/OWNERS index 84f6dde73ad..4af251b990d 100644 --- a/cluster/OWNERS +++ b/cluster/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 - cheftako diff --git a/cmd/OWNERS b/cmd/OWNERS index b8fc39c859a..16112219234 100644 --- a/cmd/OWNERS +++ b/cmd/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: - dchen1107 - lavalamp diff --git a/docs/OWNERS b/docs/OWNERS index e7cb6de7ca7..6d205d4af5c 100644 --- a/docs/OWNERS +++ b/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 diff --git a/hack/OWNERS b/hack/OWNERS index ee49bad6b9a..f1324f44859 100644 --- a/hack/OWNERS +++ b/hack/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 diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh index 71f5673bcf7..6c3b66fc489 100755 --- a/hack/update-vendor.sh +++ b/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: diff --git a/logo/OWNERS b/logo/OWNERS index 23f888405d9..2299fd21cc2 100644 --- a/logo/OWNERS +++ b/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: diff --git a/pkg/OWNERS b/pkg/OWNERS index 5956e2ba4ec..99622563823 100644 --- a/pkg/OWNERS +++ b/pkg/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: - dchen1107 - dims diff --git a/plugin/OWNERS b/plugin/OWNERS index 73e60f6b140..8fedbdd0115 100644 --- a/plugin/OWNERS +++ b/plugin/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 - dchen1107 diff --git a/staging/OWNERS b/staging/OWNERS index 525c771c239..a5085e59dd9 100644 --- a/staging/OWNERS +++ b/staging/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: - dims - lavalamp diff --git a/test/OWNERS b/test/OWNERS index bc4e6ecf85a..52a0e35fccd 100644 --- a/test/OWNERS +++ b/test/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: - aojea - neolit123 diff --git a/third_party/OWNERS b/third_party/OWNERS index 26c7f67c134..fe3599cff97 100644 --- a/third_party/OWNERS +++ b/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 diff --git a/vendor/OWNERS b/vendor/OWNERS index 83e9b56ab04..163a7393ee8 100644 --- a/vendor/OWNERS +++ b/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: From b8b86bb2e13464aab442ca578e4c8e7467d8785a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 10 Oct 2022 08:31:43 -0400 Subject: [PATCH 2/4] Sort subdir OWNERS files --- CHANGELOG/OWNERS | 6 +++--- cmd/OWNERS | 4 ++-- hack/OWNERS | 4 ++-- plugin/OWNERS | 4 ++-- staging/OWNERS | 10 +++++----- test/OWNERS | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGELOG/OWNERS b/CHANGELOG/OWNERS index 7bf255b2de4..f9554f025fd 100644 --- a/CHANGELOG/OWNERS +++ b/CHANGELOG/OWNERS @@ -6,16 +6,16 @@ options: 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 diff --git a/cmd/OWNERS b/cmd/OWNERS index 16112219234..0f2068872d0 100644 --- a/cmd/OWNERS +++ b/cmd/OWNERS @@ -5,13 +5,13 @@ options: no_parent_owners: true reviewers: - dchen1107 + - dims - lavalamp - mikedanese - thockin - - dims approvers: - dchen1107 + - dims - lavalamp - mikedanese - thockin - - dims diff --git a/hack/OWNERS b/hack/OWNERS index f1324f44859..8934f14c026 100644 --- a/hack/OWNERS +++ b/hack/OWNERS @@ -9,10 +9,10 @@ reviewers: - hwdef - justaugustus - lavalamp + - mikedanese - SataQiu - spiffxp - sttts - - mikedanese approvers: - bentheelder - cblecker @@ -21,12 +21,12 @@ approvers: - enj # for sig-auth related stuff like cert testdata - lavalamp - liggitt + - mikedanese - pwittrock - SataQiu - soltysh # for sig-cli related stuff - spiffxp - sttts - - mikedanese emeritus_approvers: - eparis - fejta diff --git a/plugin/OWNERS b/plugin/OWNERS index 8fedbdd0115..a36a067b597 100644 --- a/plugin/OWNERS +++ b/plugin/OWNERS @@ -4,13 +4,13 @@ options: # make root approval non-recursive no_parent_owners: true reviewers: - - dims - dchen1107 + - dims - lavalamp - thockin approvers: - - dims - dchen1107 + - dims - lavalamp - thockin emeritus_approvers: diff --git a/staging/OWNERS b/staging/OWNERS index a5085e59dd9..139c8fb8e35 100644 --- a/staging/OWNERS +++ b/staging/OWNERS @@ -8,12 +8,12 @@ approvers: - lavalamp - smarterclayton reviewers: + - caesarxuchao + - deads2k - dims - lavalamp - - smarterclayton - - wojtek-t - - deads2k - - caesarxuchao - - mikedanese - liggitt + - mikedanese + - smarterclayton - sttts + - wojtek-t diff --git a/test/OWNERS b/test/OWNERS index 52a0e35fccd..846203ba8d2 100644 --- a/test/OWNERS +++ b/test/OWNERS @@ -5,8 +5,8 @@ options: no_parent_owners: true reviewers: - aojea - - neolit123 - johnSchnake + - neolit123 - SataQiu approvers: - andrewsykim @@ -15,13 +15,13 @@ approvers: - bowei # for test/e2e/{dns*,network}.go - caseydavenport # for test/e2e/{dns*,network}.go - cblecker - - dims - - MrHohn - deads2k + - dims - enj - janetkuo - liggitt - mikedanese + - MrHohn - msau42 - neolit123 - oomichi From dd0910691fa8bfe8bbc4b7ff52c2fcbc5df459b0 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 10 Oct 2022 08:58:04 -0400 Subject: [PATCH 3/4] Move root approvers to subdirs --- OWNERS | 24 +++++++++--------------- build/OWNERS | 4 ++++ cluster/OWNERS | 4 ++++ cmd/OWNERS | 6 ++++++ hack/OWNERS | 9 +++++++++ pkg/OWNERS | 4 ++++ plugin/OWNERS | 6 ++++++ staging/OWNERS | 6 ++++++ test/OWNERS | 10 ++++++++++ 9 files changed, 58 insertions(+), 15 deletions(-) diff --git a/OWNERS b/OWNERS index 60dd80316be..e80625304df 100644 --- a/OWNERS +++ b/OWNERS @@ -2,24 +2,18 @@ filters: ".*": - reviewers: - - dchen1107 - - lavalamp - - smarterclayton - - thockin - - wojtek-t - - liggitt - approvers: - - dchen1107 - - lavalamp - - smarterclayton - - thockin - - wojtek-t - - liggitt + reviewers: [] + approvers: [] emeritus_approvers: - - brendandburns - bgrant0607 + - brendandburns + - dchen1107 - jbeda + - lavalamp + - liggitt + - smarterclayton + - thockin + - wojtek-t # go.{mod,sum} files relate to go dependencies, and should be reviewed by the # dep-approvers "go\\.(mod|sum)$": diff --git a/build/OWNERS b/build/OWNERS index fca6453f1ca..e610f34003b 100644 --- a/build/OWNERS +++ b/build/OWNERS @@ -11,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: @@ -23,8 +25,10 @@ approvers: - dims - justaugustus - lavalamp + - liggitt - mikedanese - spiffxp + - thockin emeritus_approvers: - fejta - jbeda diff --git a/cluster/OWNERS b/cluster/OWNERS index 4af251b990d..ba8b7cbf148 100644 --- a/cluster/OWNERS +++ b/cluster/OWNERS @@ -8,14 +8,18 @@ reviewers: - cheftako - dims - justaugustus + - liggitt - mikedanese - spiffxp + - wojtek-t approvers: - bentheelder - cheftako - dims + - liggitt - mikedanese - spiffxp + - wojtek-t emeritus_approvers: - eparis - roberthbailey # 2019-03-08 diff --git a/cmd/OWNERS b/cmd/OWNERS index 0f2068872d0..1837fd1bc65 100644 --- a/cmd/OWNERS +++ b/cmd/OWNERS @@ -7,11 +7,17 @@ reviewers: - dchen1107 - dims - lavalamp + - liggitt - mikedanese + - smarterclayton - thockin + - wojtek-t approvers: - dchen1107 - dims - lavalamp + - liggitt - mikedanese + - smarterclayton - thockin + - wojtek-t diff --git a/hack/OWNERS b/hack/OWNERS index 8934f14c026..19e61219170 100644 --- a/hack/OWNERS +++ b/hack/OWNERS @@ -6,16 +6,22 @@ options: reviewers: - bentheelder - cblecker + - dchen1107 - hwdef - justaugustus - lavalamp + - liggitt - mikedanese - SataQiu + - smarterclayton - spiffxp - sttts + - thockin + - wojtek-t approvers: - bentheelder - cblecker + - dchen1107 - deads2k - dims # for local-up-cluster related files - enj # for sig-auth related stuff like cert testdata @@ -24,9 +30,12 @@ approvers: - mikedanese - pwittrock - SataQiu + - smarterclayton - soltysh # for sig-cli related stuff - spiffxp - sttts + - thockin + - wojtek-t emeritus_approvers: - eparis - fejta diff --git a/pkg/OWNERS b/pkg/OWNERS index 99622563823..f2cee7ab32c 100644 --- a/pkg/OWNERS +++ b/pkg/OWNERS @@ -7,13 +7,17 @@ reviewers: - dchen1107 - dims - lavalamp + - liggitt - smarterclayton - thockin + - wojtek-t approvers: - dchen1107 - dims - lavalamp + - liggitt - smarterclayton - thockin + - wojtek-t emeritus_approvers: - brendandburns diff --git a/plugin/OWNERS b/plugin/OWNERS index a36a067b597..a57bb8b936e 100644 --- a/plugin/OWNERS +++ b/plugin/OWNERS @@ -7,12 +7,18 @@ reviewers: - dchen1107 - dims - lavalamp + - liggitt + - smarterclayton - thockin + - wojtek-t approvers: - dchen1107 - dims - lavalamp + - liggitt + - smarterclayton - thockin + - wojtek-t emeritus_approvers: - davidopp - brendandburns diff --git a/staging/OWNERS b/staging/OWNERS index 139c8fb8e35..ca7171cb644 100644 --- a/staging/OWNERS +++ b/staging/OWNERS @@ -4,11 +4,16 @@ options: # make root approval non-recursive no_parent_owners: true approvers: + - dchen1107 - dims - lavalamp + - liggitt - smarterclayton + - thockin + - wojtek-t reviewers: - caesarxuchao + - dchen1107 - deads2k - dims - lavalamp @@ -16,4 +21,5 @@ reviewers: - mikedanese - smarterclayton - sttts + - thockin - wojtek-t diff --git a/test/OWNERS b/test/OWNERS index 846203ba8d2..f229010745d 100644 --- a/test/OWNERS +++ b/test/OWNERS @@ -5,9 +5,15 @@ options: no_parent_owners: true reviewers: - aojea + - dchen1107 - johnSchnake + - lavalamp + - liggitt - neolit123 - SataQiu + - smarterclayton + - thockin + - wojtek-t approvers: - andrewsykim - aojea @@ -15,10 +21,12 @@ approvers: - bowei # for test/e2e/{dns*,network}.go - caseydavenport # for test/e2e/{dns*,network}.go - cblecker + - dchen1107 - deads2k - dims - enj - janetkuo + - lavalamp - liggitt - mikedanese - MrHohn @@ -32,6 +40,8 @@ approvers: - smarterclayton - soltysh - sttts + - thockin + - wojtek-t emeritus_approvers: - eparis - foxish From e74ae29ba2b4bb7a44649fc97e3e20e9400ddfd1 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 10 Oct 2022 09:04:57 -0400 Subject: [PATCH 4/4] Add sig-architecture-approvers and dep-approvers to root dir --- OWNERS | 8 ++++++-- OWNERS_ALIASES | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/OWNERS b/OWNERS index e80625304df..899861bd575 100644 --- a/OWNERS +++ b/OWNERS @@ -2,8 +2,12 @@ filters: ".*": - reviewers: [] - approvers: [] + reviewers: + - dep-reviewers + - sig-architecture-approvers + approvers: + - dep-approvers # for go.mod/go.sum + - sig-architecture-approvers # for OWNERS_ALIASES and other root files emeritus_approvers: - bgrant0607 - brendandburns diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index c44b2c18545..422104380af 100644 --- a/OWNERS_ALIASES +++ b/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