diff --git a/groups/OWNERS b/groups/OWNERS index c78c6d704e1..6fd5a148565 100644 --- a/groups/OWNERS +++ b/groups/OWNERS @@ -1,25 +1,18 @@ # See the OWNERS docs at https://go.k8s.io/owners -# approval is restricted to members of k8s-infra-group-admins@ +# root approval is restricted to members of k8s-infra-group-admins@ # because they have the ability to manually run, troubleshoot, and undo # changes -# -# approval will not be delegated to deeper directories until sufficient -# checks are in place (via testing or policy enforcement) to ensure that -# someone can't escalate privileges or create arbitrary groups -# -# ref: https://github.com/kubernetes/k8s.io/issues/460#issuecomment-849958721 options: no_parent_owners: true approvers: +- ameukam - cblecker - dims - thockin - spiffxp - -reviewers: - nikhita labels: diff --git a/groups/committee-code-of-conduct/OWNERS b/groups/committee-code-of-conduct/OWNERS index edf95db00e1..e3dadc4167d 100644 --- a/groups/committee-code-of-conduct/OWNERS +++ b/groups/committee-code-of-conduct/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- committee-code-of-conduct reviewers: - committee-code-of-conduct diff --git a/groups/committee-product-security/OWNERS b/groups/committee-product-security/OWNERS index 8eb138213ec..65cdd358924 100644 --- a/groups/committee-product-security/OWNERS +++ b/groups/committee-product-security/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- committee-product-security reviewers: - committee-product-security diff --git a/groups/committee-steering/OWNERS b/groups/committee-steering/OWNERS index 2ca3c4f3608..34c747eada3 100644 --- a/groups/committee-steering/OWNERS +++ b/groups/committee-steering/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- committee-steering reviewers: - committee-steering diff --git a/groups/groups_test.go b/groups/groups_test.go index e3ffa90fe2c..765f842a52b 100644 --- a/groups/groups_test.go +++ b/groups/groups_test.go @@ -312,8 +312,10 @@ func TestHardcodedGroupsForParanoia(t *testing.T) { "thockin@google.com", }, "k8s-infra-group-admins@kubernetes.io": []string{ + "ameukam@gmail.com", "cblecker@gmail.com", "davanum@gmail.com", + "nikhitaraghunath@gmail.com", "spiffxp@google.com", "thockin@google.com", }, diff --git a/groups/sig-api-machinery/OWNERS b/groups/sig-api-machinery/OWNERS index 6a96d31580a..151b1664d75 100644 --- a/groups/sig-api-machinery/OWNERS +++ b/groups/sig-api-machinery/OWNERS @@ -1,7 +1,9 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-api-machinery-leads reviewers: -- sig-storage-leads +- sig-api-machinery-leads labels: -- sig/storage +- sig/api-machinery diff --git a/groups/sig-apps/OWNERS b/groups/sig-apps/OWNERS index 321a40b7b8b..2899a800ec6 100644 --- a/groups/sig-apps/OWNERS +++ b/groups/sig-apps/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-apps-leads reviewers: - sig-apps-leads diff --git a/groups/sig-architecture/OWNERS b/groups/sig-architecture/OWNERS index 5a6508561b4..ca3f007a8a2 100644 --- a/groups/sig-architecture/OWNERS +++ b/groups/sig-architecture/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-architecture-leads reviewers: - sig-architecture-leads diff --git a/groups/sig-auth/OWNERS b/groups/sig-auth/OWNERS index caffd86402b..578175be507 100644 --- a/groups/sig-auth/OWNERS +++ b/groups/sig-auth/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-auth-leads reviewers: - sig-auth-leads diff --git a/groups/sig-autoscaling/OWNERS b/groups/sig-autoscaling/OWNERS index 1809ed7415e..001341e6f27 100644 --- a/groups/sig-autoscaling/OWNERS +++ b/groups/sig-autoscaling/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-autoscaling-leads reviewers: - sig-autoscaling-leads diff --git a/groups/sig-cli/OWNERS b/groups/sig-cli/OWNERS index b20e4674f60..622a05c6dc9 100644 --- a/groups/sig-cli/OWNERS +++ b/groups/sig-cli/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-cli-leads reviewers: - sig-cli-leads diff --git a/groups/sig-cloud-provider/OWNERS b/groups/sig-cloud-provider/OWNERS index a555d882957..c997205c1b0 100644 --- a/groups/sig-cloud-provider/OWNERS +++ b/groups/sig-cloud-provider/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-cloud-provider-leads reviewers: - sig-cloud-provider-leads diff --git a/groups/sig-cluster-lifecycle/OWNERS b/groups/sig-cluster-lifecycle/OWNERS index 68f9259545d..65b4d90ca57 100644 --- a/groups/sig-cluster-lifecycle/OWNERS +++ b/groups/sig-cluster-lifecycle/OWNERS @@ -1,7 +1,9 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-cluster-lifecycle-leads reviewers: - - sig-cluster-lifecycle-leads +- sig-cluster-lifecycle-leads labels: - - sig/cluster-lifecycle +- sig/cluster-lifecycle diff --git a/groups/sig-contributor-experience/OWNERS b/groups/sig-contributor-experience/OWNERS index a0beeaf9d6f..500413d8218 100644 --- a/groups/sig-contributor-experience/OWNERS +++ b/groups/sig-contributor-experience/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-contributor-experience-leads reviewers: - alisondy - cblecker diff --git a/groups/sig-docs/OWNERS b/groups/sig-docs/OWNERS index 57d88af455f..9f51cc97569 100644 --- a/groups/sig-docs/OWNERS +++ b/groups/sig-docs/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-docs-leads reviewers: - sig-docs-leads diff --git a/groups/sig-instrumentation/OWNERS b/groups/sig-instrumentation/OWNERS index f7adce5aa64..702f94fbc86 100644 --- a/groups/sig-instrumentation/OWNERS +++ b/groups/sig-instrumentation/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-instrumentation-leads reviewers: - sig-instrumentation-leads diff --git a/groups/sig-network/OWNERS b/groups/sig-network/OWNERS index 93b45cd8b3b..ec3143fa72b 100644 --- a/groups/sig-network/OWNERS +++ b/groups/sig-network/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-network-leads reviewers: - sig-network-leads diff --git a/groups/sig-node/OWNERS b/groups/sig-node/OWNERS index d7327d099e9..964c35b474b 100644 --- a/groups/sig-node/OWNERS +++ b/groups/sig-node/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-node-leads reviewers: - sig-node-leads diff --git a/groups/sig-release/OWNERS b/groups/sig-release/OWNERS index 84763dee2f4..69edac291e6 100644 --- a/groups/sig-release/OWNERS +++ b/groups/sig-release/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-release-leads reviewers: - sig-release-leads diff --git a/groups/sig-scalability/OWNERS b/groups/sig-scalability/OWNERS index 33bd56e9fc0..e3ba3d9e981 100644 --- a/groups/sig-scalability/OWNERS +++ b/groups/sig-scalability/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-scalability-leads reviewers: - sig-scalability-leads diff --git a/groups/sig-scheduling/OWNERS b/groups/sig-scheduling/OWNERS index 6a96d31580a..42b351770a0 100644 --- a/groups/sig-scheduling/OWNERS +++ b/groups/sig-scheduling/OWNERS @@ -1,7 +1,9 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-scheduling-leads reviewers: -- sig-storage-leads +- sig-scheduling-leads labels: -- sig/storage +- sig/scheduling diff --git a/groups/sig-security/OWNERS b/groups/sig-security/OWNERS index 72685b5fc41..14b2d9f9555 100644 --- a/groups/sig-security/OWNERS +++ b/groups/sig-security/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-security-leads reviewers: - sig-security-leads diff --git a/groups/sig-storage/OWNERS b/groups/sig-storage/OWNERS index 6a96d31580a..0bef5d9e2a7 100644 --- a/groups/sig-storage/OWNERS +++ b/groups/sig-storage/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-storage-leads reviewers: - sig-storage-leads diff --git a/groups/sig-testing/OWNERS b/groups/sig-testing/OWNERS index 4607cb4cbe1..6d04c01ebc3 100644 --- a/groups/sig-testing/OWNERS +++ b/groups/sig-testing/OWNERS @@ -1,5 +1,7 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- sig-testing-leads reviewers: - sig-testing-leads diff --git a/groups/wg-k8s-infra/OWNERS b/groups/wg-k8s-infra/OWNERS index 4b20e078660..a226858065d 100644 --- a/groups/wg-k8s-infra/OWNERS +++ b/groups/wg-k8s-infra/OWNERS @@ -1,4 +1,9 @@ # See the OWNERS docs at https://go.k8s.io/owners +approvers: +- wg-k8s-infra-leads reviewers: - wg-k8s-infra-leads + +labels: +- wg/k8s-infra diff --git a/groups/wg-k8s-infra/groups.yaml b/groups/wg-k8s-infra/groups.yaml index ac7fa8fc09e..949d7580f52 100644 --- a/groups/wg-k8s-infra/groups.yaml +++ b/groups/wg-k8s-infra/groups.yaml @@ -345,7 +345,9 @@ groups: settings: ReconcileMembers: "true" members: + - ameukam@gmail.com - cblecker@gmail.com - davanum@gmail.com - spiffxp@google.com + - nikhitaraghunath@gmail.com - thockin@google.com