cleanup spiffxp / defunct OWNERS

BenTheElder · BenTheElder · commit 898423b25a3e · 2024-06-27T12:21:13.000-07:00
diff --git a/OWNERS b/OWNERS
@@ -3,22 +3,21 @@
 reviewers:
 - aojea # lead
 - BenTheElder # lead
-- spiffxp # chair
-- stevekuznetsov # chair
+- stevekuznetsov
 - cjwagner # oncall, lead
 - mpherman2 # oncall
 approvers:
 - aojea # lead
 - BenTheElder # lead
-- spiffxp # chair
-- stevekuznetsov # chair
+- stevekuznetsov
 - test-infra-oncall # oncall
 - sig-k8s-infra-oncall # oncall
 emeritus_approvers:
 - amwat
 - fejta
 - ixdy
 - krzyzacy
+- spiffxp
 
 labels:
 - sig/testing
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -8,18 +8,12 @@ aliases:
   - mpherman2
   - timwangmusic
 
-  # https://github.com/kubernetes/sig-release/blob/master/release-managers.md#build-admins
-  build-admins:
-    - BenjaminKazemi
-    - MushuEE
-    - spiffxp
 
   sig-k8s-infra-oncall:
   - BenTheElder
   # kubernetes.io org admins
   - ameukam
   - dims
-  - spiffxp
   - thockin
   - upodroid
 
@@ -128,8 +122,6 @@ aliases:
     - cjwagner
     - michelle192837
     - pohly
-    - spiffxp
-    - stevekuznetsov
   sig-ui-leads:
     - floreks
     - maciaszczykm
diff --git a/config/jobs/kubernetes-sigs/e2e-framework/OWNERS b/config/jobs/kubernetes-sigs/e2e-framework/OWNERS
@@ -2,17 +2,16 @@
 
 approvers:
 - andrewsykim
-- spiffxp
 - vladimirvivien
 reviewers:
 - andrewsykim
 - cpanato
-- spiffxp
 - vladimirvivien
 
 emeritus_approvers:
 - alejandrox1
 - BenTheElder
+- spiffxp
 
 labels:
 - sig/testing
diff --git a/config/jobs/kubernetes-sigs/kubetest2/OWNERS b/config/jobs/kubernetes-sigs/kubetest2/OWNERS
@@ -3,7 +3,8 @@
 reviewers:
 - cofyc
 approvers:
-- spiffxp
+- upodroid
 emeritus_approvers:
 - amwat
-- BenTheElder
+- BenTheElder
+- spiffxp
diff --git a/config/jobs/kubernetes-sigs/slack-infra/OWNERS b/config/jobs/kubernetes-sigs/slack-infra/OWNERS
@@ -5,11 +5,11 @@ reviewers:
 - cpanato
 - jeefy
 - nikhita
-- spiffxp
 approvers:
 - Katharine
 - jeefy
 - nikhita
+emeritus_approvers:
 - spiffxp
 labels:
 - sig/contributor-experience
diff --git a/config/jobs/kubernetes/org/OWNERS b/config/jobs/kubernetes/org/OWNERS
@@ -5,14 +5,13 @@ reviewers:
 - idvoretskyi
 - mrbobbytables
 - nikhita
-- spiffxp
 approvers:
 - cblecker
 - idvoretskyi
 - mrbobbytables
 - nikhita
-- spiffxp
 emeritus_approvers:
 - fejta
+- spiffxp
 labels:
 - sig/contributor-experience
diff --git a/config/jobs/kubernetes/sig-arch/OWNERS b/config/jobs/kubernetes/sig-arch/OWNERS
@@ -8,9 +8,10 @@ reviewers:
   - bobymcbobs
 approvers:
   - cheftako
-  - spiffxp
   - johnbelamaric
   - hh
+emeritus_approvers:
+  - spiffxp
 labels:
   - area/conformance
   - sig/architecture
diff --git a/config/jobs/kubernetes/sig-k8s-infra/k8sio-presubmit.yaml b/config/jobs/kubernetes/sig-k8s-infra/k8sio-presubmit.yaml
@@ -35,7 +35,7 @@ presubmits:
       testgrid-create-test-group: 'true'
       testgrid-dashboards: sig-k8s-infra-k8sio
       testgrid-tab-name: pull-k8sio-terraform-kubernetes-io
-      testgrid-alert-email: ameukam@gmail.com,spiffxp@gmail.com,spiffxp@google.com
+      testgrid-alert-email: ameukam@gmail.com
       testgrid-num-failures-to-alert: '1'
     decorate: true
     max_concurrency: 1
@@ -64,7 +64,7 @@ presubmits:
       testgrid-create-test-group: 'true'
       testgrid-dashboards: sig-k8s-infra-k8sio
       testgrid-tab-name: pull-k8sio-terraform-kubernetes-public
-      testgrid-alert-email: ameukam@gmail.com,spiffxp@gmail.com,spiffxp@google.com
+      testgrid-alert-email: ameukam@gmail.com
       testgrid-num-failures-to-alert: '1'
     decorate: true
     max_concurrency: 1
@@ -93,7 +93,7 @@ presubmits:
       testgrid-create-test-group: 'true'
       testgrid-dashboards: sig-k8s-infra-k8sio
       testgrid-tab-name: pull-k8sio-terraform-monitoring
-      testgrid-alert-email: ameukam@gmail.com,spiffxp@gmail.com,spiffxp@google.com
+      testgrid-alert-email: ameukam@gmail.com
       testgrid-num-failures-to-alert: '1'
     decorate: true
     max_concurrency: 1
@@ -122,7 +122,7 @@ presubmits:
       testgrid-create-test-group: 'true'
       testgrid-dashboards: sig-k8s-infra-prow
       testgrid-tab-name: pull-k8sio-terraform-prow-build
-      testgrid-alert-email: ameukam@gmail.com,spiffxp@gmail.com,spiffxp@google.com
+      testgrid-alert-email: ameukam@gmail.com
       testgrid-num-failures-to-alert: '1'
     decorate: true
     max_concurrency: 1
@@ -151,7 +151,7 @@ presubmits:
       testgrid-create-test-group: 'true'
       testgrid-dashboards: sig-k8s-infra-prow
       testgrid-tab-name: pull-k8sio-terraform-prow-build-trusted
-      testgrid-alert-email: ameukam@gmail.com,spiffxp@gmail.com,spiffxp@google.com
+      testgrid-alert-email: ameukam@gmail.com
       testgrid-num-failures-to-alert: '1'
     decorate: true
     max_concurrency: 1
@@ -180,7 +180,7 @@ presubmits:
       testgrid-create-test-group: 'true'
       testgrid-dashboards: sig-k8s-infra-prow
       testgrid-tab-name: pull-k8sio-terraform-public-pii
-      testgrid-alert-email: ameukam@gmail.com,spiffxp@gmail.com,spiffxp@google.com
+      testgrid-alert-email: ameukam@gmail.com
       testgrid-num-failures-to-alert: '1'
     decorate: true
     max_concurrency: 1
diff --git a/config/testgrids/OWNERS b/config/testgrids/OWNERS
@@ -1,15 +1,14 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 reviewers:
 - michelle192837
-- spiffxp
 - wojtek-t
 - chases2
 approvers:
 - michelle192837
-- spiffxp
 - wojtek-t
 - chases2
 emeritus_approvers:
 - shyamjvs
+- spiffxp
 labels:
 - area/testgrid
diff --git a/config/testgrids/conformance/OWNERS b/config/testgrids/conformance/OWNERS
@@ -1,8 +1,5 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-- spiffxp
-- timothysc
-approvers:
+emeritus_approvers:
 - spiffxp
 - timothysc
diff --git a/config/testgrids/kubernetes/presubmits/OWNERS b/config/testgrids/kubernetes/presubmits/OWNERS
@@ -3,13 +3,14 @@
 reviewers:
 - test-infra-oncall # oncall
 - BenTheElder # lead
-- spiffxp # lead
-- stevekuznetsov # lead
+- aojea # lead
 approvers:
 - test-infra-oncall # oncall
 - BenTheElder # lead
-- spiffxp # lead
-- stevekuznetsov # lead
+- aojea # lead
+emeritus_approvers:
+- spiffxp
+- stevekuznetsov
 
 labels:
 - sig/testing
diff --git a/config/testgrids/kubernetes/sig-arch/OWNERS b/config/testgrids/kubernetes/sig-arch/OWNERS
@@ -8,9 +8,10 @@ reviewers:
   - bobymcbobs
 approvers:
   - cheftako
-  - spiffxp
   - johnbelamaric
   - hh
+emeritus_approvers:
+  - spiffxp
 labels:
   - area/conformance
   - sig/architecture
diff --git a/config/testgrids/kubernetes/sig-testing/OWNERS b/config/testgrids/kubernetes/sig-testing/OWNERS
@@ -3,13 +3,14 @@
 reviewers:
 - test-infra-oncall # oncall
 - BenTheElder # lead
-- spiffxp # lead
-- stevekuznetsov # lead
+- aojea # lead
 approvers:
 - test-infra-oncall # oncall
 - BenTheElder # lead
-- spiffxp # lead
-- stevekuznetsov # lead
+- aojea # lead
+emeritus_approvers:
+- spiffxp
+- stevekuznetsov
 
 labels:
 - sig/testing
diff --git a/docs/OWNERS b/docs/OWNERS
@@ -2,10 +2,9 @@
 
 reviewers:
 - cblecker
-- spiffxp
 approvers:
 - cblecker
-- spiffxp
-
 emeritus_approvers:
 - mithrav
+- spiffxp
+
diff --git a/gopherage/OWNERS b/gopherage/OWNERS
@@ -1,10 +1,6 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-- spiffxp
-- MushuEE
-approvers:
-- spiffxp
+# this will fall up to repo owners now, no active developers
 emeritus_approvers:
 - amwat
 - BenTheElder
diff --git a/gubernator/OWNERS b/gubernator/OWNERS
@@ -1,16 +1,12 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-- MushuEE
-- spiffxp
-- stevekuznetsov
-approvers:
-- spiffxp
-- stevekuznetsov
+# this will fall up to repo owners now, no active developers
 emeritus_approvers:
 - ibzib
 - Katharine
 - rmmh
+- spiffxp
+- stevekuznetsov
 
 labels:
 - area/gubernator
diff --git a/images/bootstrap/OWNERS b/images/bootstrap/OWNERS
@@ -1,11 +1,9 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 reviewers:
-- spiffxp
 - BenTheElder
-- MushuEE
 approvers:
-- spiffxp
 - BenTheElder
 emeritus_approvers:
 - amwat
+- spiffxp
diff --git a/images/krte/OWNERS b/images/krte/OWNERS
@@ -3,13 +3,10 @@
 reviewers:
 - aojea
 - BenTheElder
-- munnerz
-- MushuEE
-- spiffxp
 approvers:
 - aojea
 - BenTheElder
-- munnerz
-- spiffxp
 emeritus_approvers:
 - amwat
+- spiffxp
+- munnerz
diff --git a/kettle/buckets.yaml b/kettle/buckets.yaml
@@ -9,7 +9,7 @@
 #   exclude_jobs: A list of job names that will not be uploaded to BQ
 
 gs://kubernetes-jenkins/logs/:
-  contact: "spiffxp"
+  contact: "bentheelder"
   prefix: ""
   sequential: false
   exclude_jobs:
diff --git a/kettle/stream_test.py b/kettle/stream_test.py
@@ -117,7 +117,7 @@ def test_should_exclude(self, _, object_id, bucket_id, buckets, expected):
 class StreamTest(unittest.TestCase):
 
     fake_buckets = {'kubernetes-jenkins':
-                        {'contact': 'spiffxp',
+                        {'contact': 'bentheelder',
                          'prefix': '',
                          'sequential': False,
                          'exclude_jobs': ['ci-test-infra-benchmark-demo',
diff --git a/metrics/OWNERS b/metrics/OWNERS
@@ -2,9 +2,9 @@
 
 reviewers:
 - cjwagner
-- spiffxp
 approvers:
 - cjwagner
+emeritus_approvers:
 - spiffxp
 
 labels:
diff --git a/scenarios/OWNERS b/scenarios/OWNERS
@@ -1,16 +1,16 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-- MushuEE
-- spiffxp
+# these are deprecated and largely should not be touched
+# repo owners can in an emergency
 approvers:
-- spiffxp
+- BenTheElder
 emeritus_approvers:
 - amwat
 - BenTheElder
 - cjwagner
 - fejta
 - krzyzacy
+- spiffxp
 
 labels:
 - area/scenarios
diff --git a/testgrid/OWNERS b/testgrid/OWNERS
@@ -2,15 +2,14 @@
 
 reviewers:
 - michelle192837
-- spiffxp
 - wojtek-t
 - chases2
 approvers:
 - michelle192837
-- spiffxp
 - wojtek-t
 - chases2
 emeritus_approvers:
 - shyamjvs
+- spiffxp
 labels:
 - area/testgrid
diff --git a/triage/OWNERS b/triage/OWNERS
