Merge pull request #8594 from ameukam/update-k8s-infra-leads

k8s-ci-robot · web-flow · commit 04c5a1f79724 · 2025-10-07T00:52:58.000-07:00
Rotate SIG K8s leads
diff --git a/OWNERS b/OWNERS
@@ -1,17 +1,12 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 approvers:
-- ameukam # sig-k8s-infra chair
-- BenTheElder # sig-k8s-infra TL
-- dims # sig-k8s-infra chair
-- MadhavJivrajani # sig-contribex TL
-- Priyankasaggu11929 # sig-contribex TL
-- thockin
-- upodroid # sig-k8s-infra TL
-- xmudrii # sig-k8s-infra TL
+- sig-k8s-infra-leads
 
 emeritus_approvers:
 - bartsmykla
+- BenTheElder
+- dims
 - cblecker
 - mikedanese
 - nikhita
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -64,9 +64,9 @@ aliases:
     - rexagod
     - richabanker
   sig-k8s-infra-leads:
-    - BenTheElder
     - ameukam
-    - dims
+    - GenPage
+    - hakman
     - upodroid
     - xmudrii
   sig-multicluster-leads:
diff --git a/dns/zone-configs/k8s.io._0_base.yaml b/dns/zone-configs/k8s.io._0_base.yaml
@@ -292,7 +292,7 @@ prs:
 cloudfront.registry:
   type: CNAME
   value: d39mqg4b1dx9z1.cloudfront.net.
-# Sandbox OCI redirector service. (@ameukam,@BenTheElder,@thockin,@dims)
+# Sandbox OCI redirector service. (@ameukam)
 registry-sandbox:
   - type: A
     value: 107.178.255.82
@@ -302,7 +302,7 @@ registry-sandbox:
 _acme-challenge.registry-sandbox:
   - type: CNAME
     value: 893400bf-1899-4ca4-8cc3-1599310bb39b.12.authorize.certificatemanager.goog.
-# Prod OCI redirector service.  (@ameukam,@BenTheElder,@thockin,@dims)
+# Prod OCI redirector service.  (@ameukam)
 # Reach to k8s-infra-oci-proxy-admins@kubernetes.io for major issues.
 registry:
   - type: A
diff --git a/groups/groups_test.go b/groups/groups_test.go
@@ -30,11 +30,15 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-var cfg GroupsConfig
-var rConfig RestrictionsConfig
+var (
+	cfg     GroupsConfig
+	rConfig RestrictionsConfig
+)
 
-var groupsPath = flag.String("groups-path", "", "Directory containing groups.yaml files")
-var restrictionsPath = flag.String("restrictions-path", "", "Path to the configuration file containing restrictions")
+var (
+	groupsPath       = flag.String("groups-path", "", "Directory containing groups.yaml files")
+	restrictionsPath = flag.String("restrictions-path", "", "Path to the configuration file containing restrictions")
+)
 
 func TestMain(m *testing.M) {
 	flag.Parse()
@@ -148,7 +152,7 @@ func TestDescriptionLength(t *testing.T) {
 		description := g.Description
 
 		len := utf8.RuneCountInString(description)
-		//Ref: https://developers.google.com/admin-sdk/groups-settings/v1/reference/groups
+		// Ref: https://developers.google.com/admin-sdk/groups-settings/v1/reference/groups
 		if len > 300 {
 			errs = append(errs,
 				fmt.Errorf("Number of characters in description \"%s\" for group name \"%s\" "+
@@ -312,23 +316,13 @@ func TestNoDuplicateMembers(t *testing.T) {
 func TestHardcodedGroupsForParanoia(t *testing.T) {
 	groups := map[string][]string{
 		"k8s-infra-gcp-org-admins@kubernetes.io": {
-			"ameukam@gmail.com",
-			"bentheelder@google.com",
-			"cy@borg.dev",
-			"davanum@gmail.com",
 			"ihor@cncf.io",
-			"mudrinic.mare@gmail.com",
-			"thockin@google.com",
+			"sig-k8s-infra-leads@kubernetes.io",
 		},
 		"k8s-infra-group-admins@kubernetes.io": {
-			"ameukam@gmail.com",
 			"bentheelder@google.com",
 			"cblecker@gmail.com",
-			"cy@borg.dev",
-			"davanum@gmail.com",
-			"mudrinic.mare@gmail.com",
-			"nikhitaraghunath@gmail.com",
-			"thockin@google.com",
+			"sig-k8s-infra-leads@kubernetes.io",
 		},
 	}
 
diff --git a/groups/sig-contributor-experience/groups.yaml b/groups/sig-contributor-experience/groups.yaml
@@ -221,7 +221,6 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - ameukam@gmail.com
       - ctadeu@gmail.com
       - jeef111x@gmail.com
       - killen.bob@gmail.com
@@ -261,7 +260,6 @@ groups:
       ReconcileMembers: "true"
       WhoCanViewMembership: "ALL_MEMBERS_CAN_VIEW" # required
     members:
-      - ameukam@gmail.com
       - cblecker@gmail.com
       - ctadeu@gmail.com
       - davanum@gmail.com
diff --git a/groups/sig-docs/groups.yaml b/groups/sig-docs/groups.yaml
@@ -82,7 +82,6 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - ameukam@gmail.com
       - bentheelder@google.com
       - k8s-sig-docs-leads@googlegroups.com
 
diff --git a/groups/sig-k8s-infra/groups.yaml b/groups/sig-k8s-infra/groups.yaml
@@ -15,7 +15,6 @@ groups:
     members:
       - bentheelder@google.com
       - cblecker@gmail.com
-      - linusa@google.com
       - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: sig-k8s-infra-private@kubernetes.io
@@ -27,11 +26,6 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     members:
-      - bentheelder@google.com
-      - cblecker@gmail.com
-      - ihor@cncf.io
-      - justinsb@google.com
-      - james@munnelly.eu
       - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: sig-k8s-infra-leads@kubernetes.io
@@ -43,11 +37,10 @@ groups:
       ReconcileMembers: "true"
     owners:
       - ameukam@gmail.com
-      - bentheelder@google.com
+      - chacman@microsoft.com
       - cy@borg.dev
-      - davanum@gmail.com
+      - dylanddcpage@gmail.com
       - mudrinic.mare@gmail.com
-      - thockin@google.com
 
   - email-id: sig-k8s-infra@kubernetes.io
     name: sig-k8s-infra
@@ -62,7 +55,8 @@ groups:
       ReconcileMembers: "false"
     owners:
       - ameukam@gmail.com
-      - davanum@gmail.com
+      - chacman@microsoft.com
+      - dylanddcpage@gmail.com
     members:
       - sig-k8s-infra-leads@kubernetes.io
 
@@ -85,8 +79,6 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - bentheelder@google.com
-      - cblecker@gmail.com
       - sig-k8s-infra-leads@kubernetes.io
 
   #
@@ -150,8 +142,6 @@ groups:
       ReconcileMembers: "true"
     members:
       - bentheelder@google.com
-      - eddiezane@gmail.com
-      - justinsb@google.com
       - sig-k8s-infra-leads@kubernetes.io
 
   # Owners of the GCP projects:
@@ -164,7 +154,6 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - bentheelder@google.com
       - justinsb@google.com
       - sig-k8s-infra-leads@kubernetes.io
 
@@ -273,6 +262,7 @@ groups:
       - cblecker@gmail.com
       - davanum@gmail.com
       - nikhitaraghunath@gmail.com
+      - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-rbac-kubernetes-external-secrets@kubernetes.io
     name: k8s-infra-rbac-kubernetes-external-secrets
@@ -306,7 +296,6 @@ groups:
       - cy@borg.dev
       - ihor@cncf.io
       - jeefy@cncf.io
-      - k8s-infra-ii-coop@kubernetes.io
       - sig-k8s-infra-leads@kubernetes.io
       - steering-private@kubernetes.io
       - mario@kubermatic.com
@@ -329,8 +318,6 @@ groups:
       ReconcileMembers: "true"
     members:
       - ihor@cncf.io
-      - justinsb@google.com
-      - k8s-infra-ii-coop@kubernetes.io
       - sig-k8s-infra-leads@kubernetes.io
       - cncf-aws-admins@lists.cncf.io
       - mario@kubermatic.com
@@ -343,7 +330,6 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     members:
-      - k8s-infra-ii-coop@kubernetes.io
       - sig-k8s-infra-leads@kubernetes.io
       - cncf-aws-admins@lists.cncf.io
 
@@ -407,7 +393,6 @@ groups:
     members:
       - k8s-infra-release-admins@kubernetes.io
       - justinsb@google.com
-      - linusa@google.com
       - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-bigquery-admins@kubernetes.io
@@ -437,10 +422,6 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - bentheelder@google.com
-      - cblecker@gmail.com
-      - justinsb@google.com
-      - james@munnelly.eu
       - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-dns-admins@kubernetes.io
@@ -452,7 +433,6 @@ groups:
     members:
       - bentheelder@google.com
       - cblecker@gmail.com
-      - james@munnelly.eu
       - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-gcp-accounting@kubernetes.io
@@ -463,11 +443,9 @@ groups:
       ReconcileMembers: "true"
     members:
       - ihor@cncf.io
-      - justinsb@google.com
-      - k8s-infra-ii-coop@kubernetes.io
+      - mario@kubermatic.com
       - sig-k8s-infra-leads@kubernetes.io
       - steering-private@kubernetes.io
-      - mario@kubermatic.com
 
   - email-id: k8s-infra-aws-accounting@kubernetes.io
     name: k8s-infra-aws-accounting
@@ -476,11 +454,9 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - justinleegarrison@gmail.com
-      - k8s-infra-ii-coop@kubernetes.io
+      - mario@kubermatic.com
       - sig-k8s-infra-leads@kubernetes.io
       - steering-private@kubernetes.io
-      - mario@kubermatic.com
 
   - email-id: k8s-infra-yt-admins@kubernetes.io
     name: k8s-infra-yt-admins
@@ -501,13 +477,8 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - ameukam@gmail.com
-      - bentheelder@google.com
-      - cy@borg.dev
-      - davanum@gmail.com
       - ihor@cncf.io
-      - mudrinic.mare@gmail.com
-      - thockin@google.com
+      - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-public-pii@kubernetes.io
     name: k8s-infra-public-pii
@@ -517,8 +488,7 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - k8s-infra-ii-coop@kubernetes.io
-      - mudrinic.mare@gmail.com # remove after https://kubernetes.io/blog/2023/08/31/legacy-package-repository-deprecation/ is complete
+      - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-group-admins@kubernetes.io
     name: k8s-infra-group-admins
@@ -528,14 +498,9 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-      - ameukam@gmail.com
       - bentheelder@google.com
       - cblecker@gmail.com
-      - cy@borg.dev
-      - davanum@gmail.com
-      - mudrinic.mare@gmail.com
-      - nikhitaraghunath@gmail.com
-      - thockin@google.com
+      - sig-k8s-infra-leads@kubernetes.io
 
   - email-id: k8s-infra-sandbox-capa@kubernetes.io
     name: k8s-infra-sandbox-capa
@@ -547,7 +512,6 @@ groups:
     members:
       - ameukam@gmail.com
       - davanum@gmail.com
-      - hh@cncf.io
       - atharvashinde179@gmail.com
       - ankita.swamy20@gmail.com
       - richmcase@gmail.com
diff --git a/groups/sig-testing/groups.yaml b/groups/sig-testing/groups.yaml
@@ -174,9 +174,7 @@ groups:
     - k8s-infra-release-viewers@kubernetes.io
     # members
     - alarcj137@gmail.com
-    - ameukam@gmail.com
     - antonio.ojea.garcia@gmail.com
-    - bartek@smykla.com
     - eddiezane@gmail.com
     - gmccloskey@google.com
     - helenfengzhi@gmail.com
@@ -185,11 +183,11 @@ groups:
     - mrfaizal@google.com
     - ricardo.katz@gmail.com
     - rob.kielty@gmail.com
-    - spiffxp@gmail.com
     - thejoycekung@gmail.com
     - neolit123@gmail.com
     - philjohnson96@gmail.com
     - elieser.pereiraa@gmail.com
+    - sig-testing-leads@kubernetes.io
 
   #
   # sig-testing k8s-infra owners
@@ -206,26 +204,7 @@ groups:
     settings:
       ReconcileMembers: "true"
     members:
-    # test-infra-oncall
-    - amerai@google.com
-    - chaodai@google.com
-    - colew@google.com
-    - mpherman@google.com
-    - slchase@google.com
-    # sig-testing leads
-    # - amerai@google.com # already part of test-infra-oncall
-    - antonio.ojea.garcia@gmail.com
-    - bentheelder@google.com
-    - skuznets@redhat.com
-    - spiffxp@gmail.com
-    - spiffxp@google.com
-    # sig-k8s-infra members
-    - ameukam@gmail.com
-    - cblecker@gmail.com
-    - ctadeu@gmail.com
-    - davanum@gmail.com
-    - eddiezane@gmail.com
-    - thockin@google.com
+    - sig-testing-leads@kubernetes.io
 
   # RBAC groups:
   # - grant access to the `namespace-user` role for a single namespace on the `aaa` cluster
diff --git a/kubernetes/gke-utility/argocd/extras.yaml b/kubernetes/gke-utility/argocd/extras.yaml
@@ -61,9 +61,9 @@ spec:
       when:
         - key: request.headers[X-Auth-Request-User]
           values:
-            - dims
-            - upodroid
             - ameukam
-            - BenTheElder
-            - xmudrii
+            - GenPage
+            - hakman
             - iftachk
+            - upodroid
+            - xmudrii

-Original file line number
+Diff line change
     settings:
       ReconcileMembers: "true"
     members:
 -      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
       ReconcileMembers: "true"
       WhoCanViewMembership: "ALL_MEMBERS_CAN_VIEW" # required
     members:
 -      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]