Merge pull request #2034 from justaugustus/releng

Update SIG Release mailing lists and OWNERS aliases
kubernetes · May 12, 2021 · 5dec239 · 5dec239
2 parents 6dd885d + 327939c
commit 5dec239
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 47 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -175,27 +175,17 @@ aliases:
     - BenTheElder
     - MushuEE
     - spiffxp
-  build-image-approvers:
-    - BenTheElder
-    - cblecker
-    - dims
-    - justaugustus
-    - listx
-  build-image-reviewers:
-    - BenTheElder
-    - cblecker
-    - dims
-    - justaugustus
-    - listx
   cip-approvers:
+    - hasheddan
     - justaugustus
-    - justinsb
     - listx
+    - saschagrunert
     - thockin
   cip-reviewers:
+    - hasheddan
     - justaugustus
-    - justinsb
     - listx
+    - saschagrunert
     - thockin
   provider-aws:
     - d-nishi
@@ -218,28 +208,20 @@ aliases:
     - cantbewong
     - frapposelli
   release-engineering-approvers:
-    - alejandrox1 # SIG Technical Lead
     - cpanato # Release Manager
-    - feiskyer # Release Manager
     - hasheddan # subproject owner / Release Manager / SIG Technical Lead
-    - idealhack # Release Manager
     - jeremyrickard # SIG Technical Lead
     - justaugustus # subproject owner / Release Manager / SIG Chair
     - puerco # Release Manager
     - saschagrunert # subproject owner / Release Manager / SIG Chair
-    - tpepper # subproject owner
     - xmudrii # Release Manager
   release-engineering-reviewers:
-    - alejandrox1 # SIG Technical Lead
     - cpanato # Release Manager
-    - feiskyer # Release Manager
     - hasheddan # subproject owner / Release Manager / SIG Technical Lead
-    - idealhack # Release Manager
     - jeremyrickard # SIG Technical Lead
     - justaugustus # subproject owner / Release Manager / SIG Chair
     - puerco # Release Manager
     - saschagrunert # subproject owner / Release Manager / SIG Chair
-    - tpepper # subproject owner
     - xmudrii # Release Manager
   # business hours oncall for prow etc (https://go.k8s.io/oncall)
   test-infra-oncall:

diff --git a/groups/sig-release/groups.yaml b/groups/sig-release/groups.yaml
@@ -56,9 +56,7 @@ groups:
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
@@ -81,11 +79,13 @@ groups:
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
       - [email protected]
+      - [email protected]
       - [email protected]
       - [email protected]
+      - [email protected]
+      - [email protected]
 
   - email-id: [email protected]
     name: k8s-infra-staging-artifact-promoter
@@ -108,11 +108,6 @@ groups:
       ReconcileMembers: "true"
     members:
       - [email protected]
-      - [email protected]
-      - [email protected]
-      - [email protected]
-      - [email protected]
-      - [email protected]
 
   - email-id: [email protected]
     name: k8s-infra-staging-ci-images
@@ -227,13 +222,10 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     owners:
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
-    managers:
-      - [email protected] # Release Team subproject owner
     members:
       - [email protected] # 1.21 Comms Lead
       - [email protected] # 1.21 Comms Shadow
@@ -257,7 +249,6 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     owners:
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
@@ -266,8 +257,6 @@ groups:
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
-      - [email protected]
       - [email protected]
 
   - email-id: [email protected]
@@ -280,7 +269,6 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     owners:
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
@@ -295,20 +283,20 @@ groups:
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
-      - [email protected]
       - [email protected]
       - [email protected]
+      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
+      - [email protected]
+      - [email protected]
 
   - email-id: [email protected]
     name: security-release-team
@@ -332,7 +320,6 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     owners:
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
@@ -348,7 +335,6 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     owners:
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
@@ -359,7 +345,6 @@ groups:
       - [email protected] # 1.22 RT Lead Shadow
       - [email protected] # 1.22 RT Lead Shadow
       - [email protected] # 1.22 RT Lead
-      - [email protected] # Release Team subproject owner
     members:
       - [email protected]
       - [email protected] # 1.21 Bug Triage Shadow
@@ -403,14 +388,12 @@ groups:
       WhoCanPostMessage: "ANYONE_CAN_POST"
       ReconcileMembers: "true"
     owners:
-      - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
       - [email protected]
     managers:
       - [email protected] # 1.22 Emeritus Advisor
-      - [email protected] # Release Team subproject owner
     members:
       - [email protected] # 1.21 Bug Triage Shadow
       - [email protected] # 1.21 RT Enhancements Shadow

diff --git a/k8s.gcr.io/images/k8s-staging-build-image/OWNERS b/k8s.gcr.io/images/k8s-staging-build-image/OWNERS
@@ -1,9 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 approvers:
-  - build-image-approvers
+  - release-engineering-approvers
 reviewers:
-  - build-image-reviewers
+  - release-engineering-reviewers
 
 labels:
   - sig/release