Skip to content

Commit 04c5a1f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8594 from ameukam/update-k8s-infra-leads
Rotate SIG K8s leads
2 parents 668db89 + 5330319 commit 04c5a1f

File tree

9 files changed

+34
-105
lines changed

9 files changed

+34
-105
lines changed

‎OWNERS‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
approvers:
4-
- ameukam # sig-k8s-infra chair
5-
- BenTheElder # sig-k8s-infra TL
6-
- dims # sig-k8s-infra chair
7-
- MadhavJivrajani # sig-contribex TL
8-
- Priyankasaggu11929 # sig-contribex TL
9-
- thockin
10-
- upodroid # sig-k8s-infra TL
11-
- xmudrii # sig-k8s-infra TL
4+
- sig-k8s-infra-leads
125

136
emeritus_approvers:
147
- bartsmykla
8+
- BenTheElder
9+
- dims
1510
- cblecker
1611
- mikedanese
1712
- nikhita

‎OWNERS_ALIASES‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ aliases:
6464
- rexagod
6565
- richabanker
6666
sig-k8s-infra-leads:
67-
- BenTheElder
6867
- ameukam
69-
- dims
68+
- GenPage
69+
- hakman
7070
- upodroid
7171
- xmudrii
7272
sig-multicluster-leads:

‎dns/zone-configs/k8s.io._0_base.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ prs:
292292
cloudfront.registry:
293293
type: CNAME
294294
value: d39mqg4b1dx9z1.cloudfront.net.
295-
# Sandbox OCI redirector service. (@ameukam,@BenTheElder,@thockin,@dims)
295+
# Sandbox OCI redirector service. (@ameukam)
296296
registry-sandbox:
297297
- type: A
298298
value: 107.178.255.82
@@ -302,7 +302,7 @@ registry-sandbox:
302302
_acme-challenge.registry-sandbox:
303303
- type: CNAME
304304
value: 893400bf-1899-4ca4-8cc3-1599310bb39b.12.authorize.certificatemanager.goog.
305-
# Prod OCI redirector service. (@ameukam,@BenTheElder,@thockin,@dims)
305+
# Prod OCI redirector service. (@ameukam)
306306
# Reach to k8s-infra-oci-proxy-admins@kubernetes.io for major issues.
307307
registry:
308308
- type: A

‎groups/groups_test.go‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,15 @@ import (
3030
"k8s.io/apimachinery/pkg/util/sets"
3131
)
3232

33-
var cfg GroupsConfig
34-
var rConfig RestrictionsConfig
33+
var (
34+
cfg GroupsConfig
35+
rConfig RestrictionsConfig
36+
)
3537

36-
var groupsPath = flag.String("groups-path", "", "Directory containing groups.yaml files")
37-
var restrictionsPath = flag.String("restrictions-path", "", "Path to the configuration file containing restrictions")
38+
var (
39+
groupsPath = flag.String("groups-path", "", "Directory containing groups.yaml files")
40+
restrictionsPath = flag.String("restrictions-path", "", "Path to the configuration file containing restrictions")
41+
)
3842

3943
func TestMain(m *testing.M) {
4044
flag.Parse()
@@ -148,7 +152,7 @@ func TestDescriptionLength(t *testing.T) {
148152
description := g.Description
149153

150154
len := utf8.RuneCountInString(description)
151-
//Ref: https://developers.google.com/admin-sdk/groups-settings/v1/reference/groups
155+
// Ref: https://developers.google.com/admin-sdk/groups-settings/v1/reference/groups
152156
if len > 300 {
153157
errs = append(errs,
154158
fmt.Errorf("Number of characters in description \"%s\" for group name \"%s\" "+
@@ -312,23 +316,13 @@ func TestNoDuplicateMembers(t *testing.T) {
312316
func TestHardcodedGroupsForParanoia(t *testing.T) {
313317
groups := map[string][]string{
314318
"k8s-infra-gcp-org-admins@kubernetes.io": {
315-
"ameukam@gmail.com",
316-
"bentheelder@google.com",
317-
"cy@borg.dev",
318-
"davanum@gmail.com",
319319
"ihor@cncf.io",
320-
"mudrinic.mare@gmail.com",
321-
"thockin@google.com",
320+
"sig-k8s-infra-leads@kubernetes.io",
322321
},
323322
"k8s-infra-group-admins@kubernetes.io": {
324-
"ameukam@gmail.com",
325323
"bentheelder@google.com",
326324
"cblecker@gmail.com",
327-
"cy@borg.dev",
328-
"davanum@gmail.com",
329-
"mudrinic.mare@gmail.com",
330-
"nikhitaraghunath@gmail.com",
331-
"thockin@google.com",
325+
"sig-k8s-infra-leads@kubernetes.io",
332326
},
333327
}
334328

‎groups/sig-contributor-experience/groups.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ groups:
221221
settings:
222222
ReconcileMembers: "true"
223223
members:
224-
- ameukam@gmail.com
225224
- ctadeu@gmail.com
226225
- jeef111x@gmail.com
227226
- killen.bob@gmail.com
@@ -261,7 +260,6 @@ groups:
261260
ReconcileMembers: "true"
262261
WhoCanViewMembership: "ALL_MEMBERS_CAN_VIEW" # required
263262
members:
264-
- ameukam@gmail.com
265263
- cblecker@gmail.com
266264
- ctadeu@gmail.com
267265
- davanum@gmail.com

‎groups/sig-docs/groups.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ groups:
8282
settings:
8383
ReconcileMembers: "true"
8484
members:
85-
- ameukam@gmail.com
8685
- bentheelder@google.com
8786
- k8s-sig-docs-leads@googlegroups.com
8887

‎groups/sig-k8s-infra/groups.yaml‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ groups:
1515
members:
1616
- bentheelder@google.com
1717
- cblecker@gmail.com
18-
- linusa@google.com
1918
- sig-k8s-infra-leads@kubernetes.io
2019

2120
- email-id: sig-k8s-infra-private@kubernetes.io
@@ -27,11 +26,6 @@ groups:
2726
WhoCanPostMessage: "ANYONE_CAN_POST"
2827
ReconcileMembers: "true"
2928
members:
30-
- bentheelder@google.com
31-
- cblecker@gmail.com
32-
- ihor@cncf.io
33-
- justinsb@google.com
34-
- james@munnelly.eu
3529
- sig-k8s-infra-leads@kubernetes.io
3630

3731
- email-id: sig-k8s-infra-leads@kubernetes.io
@@ -43,11 +37,10 @@ groups:
4337
ReconcileMembers: "true"
4438
owners:
4539
- ameukam@gmail.com
46-
- bentheelder@google.com
40+
- chacman@microsoft.com
4741
- cy@borg.dev
48-
- davanum@gmail.com
42+
- dylanddcpage@gmail.com
4943
- mudrinic.mare@gmail.com
50-
- thockin@google.com
5144

5245
- email-id: sig-k8s-infra@kubernetes.io
5346
name: sig-k8s-infra
@@ -62,7 +55,8 @@ groups:
6255
ReconcileMembers: "false"
6356
owners:
6457
- ameukam@gmail.com
65-
- davanum@gmail.com
58+
- chacman@microsoft.com
59+
- dylanddcpage@gmail.com
6660
members:
6761
- sig-k8s-infra-leads@kubernetes.io
6862

@@ -85,8 +79,6 @@ groups:
8579
settings:
8680
ReconcileMembers: "true"
8781
members:
88-
- bentheelder@google.com
89-
- cblecker@gmail.com
9082
- sig-k8s-infra-leads@kubernetes.io
9183

9284
#
@@ -150,8 +142,6 @@ groups:
150142
ReconcileMembers: "true"
151143
members:
152144
- bentheelder@google.com
153-
- eddiezane@gmail.com
154-
- justinsb@google.com
155145
- sig-k8s-infra-leads@kubernetes.io
156146

157147
# Owners of the GCP projects:
@@ -164,7 +154,6 @@ groups:
164154
settings:
165155
ReconcileMembers: "true"
166156
members:
167-
- bentheelder@google.com
168157
- justinsb@google.com
169158
- sig-k8s-infra-leads@kubernetes.io
170159

@@ -273,6 +262,7 @@ groups:
273262
- cblecker@gmail.com
274263
- davanum@gmail.com
275264
- nikhitaraghunath@gmail.com
265+
- sig-k8s-infra-leads@kubernetes.io
276266

277267
- email-id: k8s-infra-rbac-kubernetes-external-secrets@kubernetes.io
278268
name: k8s-infra-rbac-kubernetes-external-secrets
@@ -306,7 +296,6 @@ groups:
306296
- cy@borg.dev
307297
- ihor@cncf.io
308298
- jeefy@cncf.io
309-
- k8s-infra-ii-coop@kubernetes.io
310299
- sig-k8s-infra-leads@kubernetes.io
311300
- steering-private@kubernetes.io
312301
- mario@kubermatic.com
@@ -329,8 +318,6 @@ groups:
329318
ReconcileMembers: "true"
330319
members:
331320
- ihor@cncf.io
332-
- justinsb@google.com
333-
- k8s-infra-ii-coop@kubernetes.io
334321
- sig-k8s-infra-leads@kubernetes.io
335322
- cncf-aws-admins@lists.cncf.io
336323
- mario@kubermatic.com
@@ -343,7 +330,6 @@ groups:
343330
WhoCanPostMessage: "ANYONE_CAN_POST"
344331
ReconcileMembers: "true"
345332
members:
346-
- k8s-infra-ii-coop@kubernetes.io
347333
- sig-k8s-infra-leads@kubernetes.io
348334
- cncf-aws-admins@lists.cncf.io
349335

@@ -407,7 +393,6 @@ groups:
407393
members:
408394
- k8s-infra-release-admins@kubernetes.io
409395
- justinsb@google.com
410-
- linusa@google.com
411396
- sig-k8s-infra-leads@kubernetes.io
412397

413398
- email-id: k8s-infra-bigquery-admins@kubernetes.io
@@ -437,10 +422,6 @@ groups:
437422
settings:
438423
ReconcileMembers: "true"
439424
members:
440-
- bentheelder@google.com
441-
- cblecker@gmail.com
442-
- justinsb@google.com
443-
- james@munnelly.eu
444425
- sig-k8s-infra-leads@kubernetes.io
445426

446427
- email-id: k8s-infra-dns-admins@kubernetes.io
@@ -452,7 +433,6 @@ groups:
452433
members:
453434
- bentheelder@google.com
454435
- cblecker@gmail.com
455-
- james@munnelly.eu
456436
- sig-k8s-infra-leads@kubernetes.io
457437

458438
- email-id: k8s-infra-gcp-accounting@kubernetes.io
@@ -463,11 +443,9 @@ groups:
463443
ReconcileMembers: "true"
464444
members:
465445
- ihor@cncf.io
466-
- justinsb@google.com
467-
- k8s-infra-ii-coop@kubernetes.io
446+
- mario@kubermatic.com
468447
- sig-k8s-infra-leads@kubernetes.io
469448
- steering-private@kubernetes.io
470-
- mario@kubermatic.com
471449

472450
- email-id: k8s-infra-aws-accounting@kubernetes.io
473451
name: k8s-infra-aws-accounting
@@ -476,11 +454,9 @@ groups:
476454
settings:
477455
ReconcileMembers: "true"
478456
members:
479-
- justinleegarrison@gmail.com
480-
- k8s-infra-ii-coop@kubernetes.io
457+
- mario@kubermatic.com
481458
- sig-k8s-infra-leads@kubernetes.io
482459
- steering-private@kubernetes.io
483-
- mario@kubermatic.com
484460

485461
- email-id: k8s-infra-yt-admins@kubernetes.io
486462
name: k8s-infra-yt-admins
@@ -501,13 +477,8 @@ groups:
501477
settings:
502478
ReconcileMembers: "true"
503479
members:
504-
- ameukam@gmail.com
505-
- bentheelder@google.com
506-
- cy@borg.dev
507-
- davanum@gmail.com
508480
- ihor@cncf.io
509-
- mudrinic.mare@gmail.com
510-
- thockin@google.com
481+
- sig-k8s-infra-leads@kubernetes.io
511482

512483
- email-id: k8s-infra-public-pii@kubernetes.io
513484
name: k8s-infra-public-pii
@@ -517,8 +488,7 @@ groups:
517488
settings:
518489
ReconcileMembers: "true"
519490
members:
520-
- k8s-infra-ii-coop@kubernetes.io
521-
- mudrinic.mare@gmail.com # remove after https://kubernetes.io/blog/2023/08/31/legacy-package-repository-deprecation/ is complete
491+
- sig-k8s-infra-leads@kubernetes.io
522492

523493
- email-id: k8s-infra-group-admins@kubernetes.io
524494
name: k8s-infra-group-admins
@@ -528,14 +498,9 @@ groups:
528498
settings:
529499
ReconcileMembers: "true"
530500
members:
531-
- ameukam@gmail.com
532501
- bentheelder@google.com
533502
- cblecker@gmail.com
534-
- cy@borg.dev
535-
- davanum@gmail.com
536-
- mudrinic.mare@gmail.com
537-
- nikhitaraghunath@gmail.com
538-
- thockin@google.com
503+
- sig-k8s-infra-leads@kubernetes.io
539504

540505
- email-id: k8s-infra-sandbox-capa@kubernetes.io
541506
name: k8s-infra-sandbox-capa
@@ -547,7 +512,6 @@ groups:
547512
members:
548513
- ameukam@gmail.com
549514
- davanum@gmail.com
550-
- hh@cncf.io
551515
- atharvashinde179@gmail.com
552516
- ankita.swamy20@gmail.com
553517
- richmcase@gmail.com

‎groups/sig-testing/groups.yaml‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ groups:
174174
- k8s-infra-release-viewers@kubernetes.io
175175
# members
176176
- alarcj137@gmail.com
177-
- ameukam@gmail.com
178177
- antonio.ojea.garcia@gmail.com
179-
- bartek@smykla.com
180178
- eddiezane@gmail.com
181179
- gmccloskey@google.com
182180
- helenfengzhi@gmail.com
@@ -185,11 +183,11 @@ groups:
185183
- mrfaizal@google.com
186184
- ricardo.katz@gmail.com
187185
- rob.kielty@gmail.com
188-
- spiffxp@gmail.com
189186
- thejoycekung@gmail.com
190187
- neolit123@gmail.com
191188
- philjohnson96@gmail.com
192189
- elieser.pereiraa@gmail.com
190+
- sig-testing-leads@kubernetes.io
193191

194192
#
195193
# sig-testing k8s-infra owners
@@ -206,26 +204,7 @@ groups:
206204
settings:
207205
ReconcileMembers: "true"
208206
members:
209-
# test-infra-oncall
210-
- amerai@google.com
211-
- chaodai@google.com
212-
- colew@google.com
213-
- mpherman@google.com
214-
- slchase@google.com
215-
# sig-testing leads
216-
# - amerai@google.com # already part of test-infra-oncall
217-
- antonio.ojea.garcia@gmail.com
218-
- bentheelder@google.com
219-
- skuznets@redhat.com
220-
- spiffxp@gmail.com
221-
- spiffxp@google.com
222-
# sig-k8s-infra members
223-
- ameukam@gmail.com
224-
- cblecker@gmail.com
225-
- ctadeu@gmail.com
226-
- davanum@gmail.com
227-
- eddiezane@gmail.com
228-
- thockin@google.com
207+
- sig-testing-leads@kubernetes.io
229208

230209
# RBAC groups:
231210
# - grant access to the `namespace-user` role for a single namespace on the `aaa` cluster

‎kubernetes/gke-utility/argocd/extras.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ spec:
6161
when:
6262
- key: request.headers[X-Auth-Request-User]
6363
values:
64-
- dims
65-
- upodroid
6664
- ameukam
67-
- BenTheElder
68-
- xmudrii
65+
- GenPage
66+
- hakman
6967
- iftachk
68+
- upodroid
69+
- xmudrii

0 commit comments

Comments
 (0)