Merge pull request #132220 from BenTheElder/a-little-owners-cleanup

emeritus spiffxp and backfill OWNERS

OWNERS_ALIASES

@@ -215,10 +215,13 @@ aliases:
     - seans3
     - soltysh
   sig-testing-reviewers:
+    - aojea
     - bentheelder
     - cblecker
-    - spiffxp
     - dims
+    - pohly
+  # emeritus:
+  # - spiffxp
   sig-node-approvers:
     - Random-Liu
     - dchen1107
@@ -553,5 +556,6 @@ aliases:
   conformance-behavior-approvers:
     - smarterclayton
     - johnbelamaric
-    - spiffxp
     - dims
+  # emeritus:
+  # - spiffpx

build/OWNERS

@@ -14,7 +14,6 @@ reviewers:
   - palnabarun # Release Manager
   - puerco # SIG Technical Lead / RelEng subproject owner / Release Manager
   - saschagrunert # SIG Chair / RelEng subproject owner / Release Manager
-  - spiffxp
   - thockin
   - Verolop # Release Manager
   - xmudrii # Release Manager
@@ -25,10 +24,10 @@ approvers:
   - justaugustus
   - liggitt
   - mikedanese
-  - spiffxp
   - thockin
 emeritus_approvers:
   - fejta
   - jbeda
+  - spiffxp
   - zmerlynn
   - lavalamp

cmd/kube-controller-manager/OWNERS

@@ -29,7 +29,6 @@ reviewers:
   - sjenning
   - smarterclayton
   - soltysh
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t

cmd/preferredimports/OWNERS

@@ -2,7 +2,9 @@
 
 reviewers:
   - johnSchnake
+  - BenTheElder
 approvers:
   - dims
   - cblecker
+emeritus_aprovers:
   - spiffxp

hack/OWNERS

@@ -13,7 +13,6 @@ reviewers:
   - pohly
   - SataQiu
   - smarterclayton
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
@@ -31,7 +30,6 @@ approvers:
   - SataQiu
   - smarterclayton
   - soltysh # for sig-cli related stuff
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
@@ -43,3 +41,4 @@ emeritus_approvers:
   - lavalamp
   - zmerlynn
   - vishh
+  - spiffxp

pkg/util/coverage/OWNERS

@@ -2,9 +2,9 @@
 
 approvers:
   - bentheelder
-  - spiffxp
 reviewers:
   - bentheelder
+emeritus_approvers:
   - spiffxp
 labels:
   - sig/testing

test/OWNERS

@@ -35,7 +35,6 @@ approvers:
   - SataQiu
   - smarterclayton
   - soltysh
-  - spiffxp
   - sttts
   - thockin
   - wojtek-t
@@ -56,6 +55,7 @@ emeritus_approvers:
   - ncdc
   - vishh
   - shyamjvs
+  - spiffxp
   - enisoc
   - alejandrox1
   - timothysc

test/conformance/OWNERS

@@ -2,14 +2,15 @@
 
 # This is the owner of the test code.  The test data itself is owned by sig-architecture.
 reviewers:
+  - bentheelder
   - cheftako
   - oomichi
   - johnbelamaric
 approvers:
   - cheftako
-  - spiffxp
   - johnbelamaric
 emeritus_approvers:
+  - spiffxp
 labels:
   - area/conformance
   - sig/architecture

test/conformance/image/OWNERS

@@ -2,17 +2,16 @@
 
 reviewers:
   - dims
-  - spiffxp
   - bentheelder
   - johnSchnake
 approvers:
   - dims
-  - spiffxp
   - bentheelder
 emeritus_approvers:
   - ixdy
   - timothysc
   - neolit123
+  - spiffxp
 labels:
   - sig/release
   - sig/testing

test/conformance/testdata/OWNERS

@@ -4,8 +4,8 @@
 options:
   no_parent_owners: true
 reviewers:
+  - bentheelder
   - smarterclayton
-  - spiffxp
   - dims
   - johnbelamaric
 approvers:

test/e2e/architecture/OWNERS

@@ -3,14 +3,15 @@
 # This is the owner of the test code.  The test data itself is owned by sig-architecture.
 reviewers:
   - aojea
+  - bentheelder
   - cheftako
   - oomichi
   - johnbelamaric
 approvers:
   - cheftako
-  - spiffxp
   - johnbelamaric
 emeritus_approvers:
+  - spiffxp
 labels:
   - area/conformance
   - sig/architecture