Merge pull request #35845 from ameukam/drop-oncall-owners-alias

k8s-infra: Rotate k8s-infra leads & cleanup OWNERS alias

Author: k8s-ci-robot

OWNERS

@@ -13,7 +13,6 @@ approvers:
 - stevekuznetsov
 - krzyzacy
 - test-infra-oncall # oncall
-- sig-k8s-infra-oncall # oncall
 emeritus_approvers:
 - amwat
 - fejta

OWNERS_ALIASES

@@ -8,15 +8,6 @@ aliases:
   - mpherman2
   - timwangmusic
 
-
-  sig-k8s-infra-oncall:
-  - BenTheElder
-  # kubernetes.io org admins
-  - ameukam
-  - dims
-  - thockin
-  - upodroid
-
   # copied from git.k8s.io/community/OWNERS_ALIASES
   sig-api-machinery-leads:
     - deads2k
@@ -81,9 +72,9 @@ aliases:
     - rexagod
     - richabanker
   sig-k8s-infra-leads:
-    - BenTheElder
     - ameukam
-    - dims
+    - GenPage
+    - hakman
     - upodroid
     - xmudrii
   sig-multicluster-leads:

config/jobs/image-pushing/OWNERS

@@ -7,8 +7,10 @@ reviewers:
 - ameukam
 - BenTheElder
 - dims
+- upodroid
+- xmudrii
 
 # All oncallers
 approvers:
 - test-infra-oncall
-- sig-k8s-infra-oncall
+- sig-k8s-infra-leads

config/jobs/kubernetes/sig-k8s-infra/trusted/OWNERS

@@ -5,9 +5,9 @@ options:
 filters:
   ".*":
     reviewers:
-    - sig-k8s-infra-oncall
+    - sig-k8s-infra-leads
     approvers:
-    - sig-k8s-infra-oncall
+    - sig-k8s-infra-leads
     - test-infra-oncall
   # ContribEx related jobs that K8s infra owns (currently
   # only the sig-contirbex-k8s-triage-robot.yaml job) should

config/jobs/kubernetes/sig-k8s-infra/trusted/sig-k8s-infra-apps.sh

@@ -24,15 +24,15 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
 readonly OUTPUT="${SCRIPT_DIR}/sig-k8s-infra-apps.yaml"
 # list of subdirs in kubernetes/k8s.io/apps
 readonly APPS=(
-    codesearch
-    elekto
-    gcsweb
-    kettle
-    k8s-io
-    kubernetes-external-secrets
-    perfdash
-    publishing-bot
-    slack-infra
+  codesearch
+  elekto
+  gcsweb
+  kettle
+  k8s-io
+  kubernetes-external-secrets
+  perfdash
+  publishing-bot
+  slack-infra
 )
 
 cat >"${OUTPUT}" <<EOF
@@ -43,7 +43,7 @@ postsubmits:
 EOF
 
 for app in "${APPS[@]}"; do
-    cat >>"${OUTPUT}" <<EOF
+  cat >>"${OUTPUT}" <<EOF
     - name: post-k8sio-deploy-app-${app}
       cluster: k8s-infra-prow-build-trusted
       decorate: true
@@ -70,7 +70,6 @@ for app in "${APPS[@]}"; do
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall

config/jobs/kubernetes/sig-k8s-infra/trusted/sig-k8s-infra-apps.yaml

@@ -28,7 +28,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -69,7 +68,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -110,7 +108,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -151,7 +148,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -192,7 +188,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -233,7 +228,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -274,7 +268,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -315,7 +308,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall
@@ -356,7 +348,6 @@ postsubmits:
         testgrid-num-failures-to-alert: '1'
       rerun_auth_config:
         github_team_slugs:
-        # proxy for sig-k8s-infra-oncall
         - org: kubernetes
           slug: sig-k8s-infra-leads
         # proxy for test-infra-oncall

config/jobs/kubernetes/sig-k8s-infra/trusted/sig-k8s-infra-dns.yaml

@@ -14,7 +14,6 @@ postsubmits:
       testgrid-num-failures-to-alert: '1'
     rerun_auth_config:
       github_team_slugs:
-      # proxy for sig-k8s-infra-oncall
       - org: kubernetes
         slug: sig-k8s-infra-leads
       # TODO(spiffxp): team specifically for this service
@@ -47,7 +46,6 @@ periodics:
     testgrid-num-failures-to-alert: '1'
   rerun_auth_config:
     github_team_slugs:
-    # proxy for sig-k8s-infra-oncall
     - org: kubernetes
       slug: sig-k8s-infra-leads
     # TODO(spiffxp): team specifically for this service

config/jobs/kubernetes/sig-k8s-infra/trusted/sig-k8s-infra-groups.yaml

@@ -15,7 +15,6 @@ periodics:
     testgrid-num-failures-to-alert: '3'
   rerun_auth_config:
     github_team_slugs:
-    # proxy for sig-k8s-infra-oncall
     - org: kubernetes
       slug: sig-k8s-infra-leads
     # team specifically for this service
@@ -50,7 +49,6 @@ postsubmits:
       testgrid-num-failures-to-alert: '1'
     rerun_auth_config:
       github_team_slugs:
-      # proxy for sig-k8s-infra-oncall
       - org: kubernetes
         slug: sig-k8s-infra-leads
       # team specifically for this service

config/jobs/kubernetes/sig-k8s-infra/trusted/sig-k8s-infra-prow.yaml

@@ -15,7 +15,6 @@ postsubmits:
       testgrid-num-failures-to-alert: '1'
     rerun_auth_config:
       github_team_slugs:
-      # proxy for sig-k8s-infra-oncall
       - org: kubernetes
         slug: sig-k8s-infra-leads
       # proxy for test-infra-oncall
@@ -51,7 +50,6 @@ postsubmits:
       testgrid-num-failures-to-alert: '1'
     rerun_auth_config:
       github_team_slugs:
-      # proxy for sig-k8s-infra-oncall
       - org: kubernetes
         slug: sig-k8s-infra-leads
       # proxy for test-infra-oncall
@@ -119,7 +117,6 @@ periodics:
     description: runs autobumper to create/update a PR that updates prow.k8s.io
   rerun_auth_config:
     github_team_slugs:
-    # proxy for sig-k8s-infra-oncall
     - org: kubernetes
       slug: sig-k8s-infra-leads
     # proxy for test-infra-oncall
@@ -157,7 +154,6 @@ periodics:
     description: runs autobumper to create/update a PR that updates prow components in k/test-infra
   rerun_auth_config:
     github_team_slugs:
-    # proxy for sig-k8s-infra-oncall
     - org: kubernetes
       slug: sig-k8s-infra-leads
     # proxy for test-infra-oncall

config/jobs/kubernetes/sig-k8s-infra/trusted/sig-k8s-infra-test-infra.yaml

@@ -77,7 +77,6 @@ periodics:
     description: Runs BigQuery queries to generate data for metrics.
   rerun_auth_config:
     github_team_slugs:
-    # proxy for sig-k8s-infra-oncall
     - org: kubernetes
       slug: sig-k8s-infra-leads
     # proxy for test-infra-oncall
@@ -109,7 +108,6 @@ periodics:
     description: Runs BigQuery queries, summarizes results into clusters, and uploads to GCS for go.k8s.io/triage
   rerun_auth_config:
     github_team_slugs:
-    # proxy for sig-k8s-infra-oncall
     - org: kubernetes
       slug: sig-k8s-infra-leads
     # proxy for test-infra-oncall