Merge pull request #900 from spiffxp/add-mrbobbytables-as-owner

Rotate calebamiles for mrbobbytables in github admin team
kubernetes · Jun 12, 2019 · 84e67c6 · 84e67c6
2 parents 50881f1 + 1014314
commit 84e67c6
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 115 deletions.
diff --git a/OWNERS b/OWNERS
@@ -1,16 +1,21 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 reviewers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
 approvers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
+emeritus_approvers:
+  - calebamiles
+
+labels:
+  - sig/contributor-experience
diff --git a/admin/BUILD.bazel b/admin/BUILD.bazel
@@ -11,10 +11,10 @@ sh_binary(
         "--fix-org-members",
         "--fix-teams",
         "--fix-team-members",
-        "--required-admins=calebamiles",
         "--required-admins=cblecker",
         "--required-admins=fejta",
         "--required-admins=idvoretskyi",
+        "--required-admins=mrbobbytables",
         "--required-admins=nikhita",
         "--required-admins=spiffxp",
     ],

diff --git a/config/config_test.go b/config/config_test.go
@@ -221,7 +221,7 @@ func TestAllOrgs(t *testing.T) {
 		allOrgMembers := members.Union(admins)
 
 		if both := admins.Intersection(members); len(both) > 0 {
-			t.Errorf("users in both org admin and member roles: %s", strings.Join(both.List(), ", "))
+			t.Errorf("users in both org admin and member roles for org '%s': %s", *org.Name, strings.Join(both.List(), ", "))
 		}
 
 		if !admins.Has("k8s-ci-robot") {

diff --git a/config/kubernetes-client/OWNERS b/config/kubernetes-client/OWNERS
@@ -2,11 +2,12 @@
 
 reviewers:
   - justaugustus
-  - mrbobbytables
 approvers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
+emeritus_approvers:
+  - calebamiles
diff --git a/config/kubernetes-client/org.yaml b/config/kubernetes-client/org.yaml
@@ -5,12 +5,12 @@ has_organization_projects: true
 has_repository_projects: true
 members_can_create_repositories: false
 admins:
-- calebamiles
 - cblecker
 - fejta
 - idvoretskyi
 - k8s-ci-robot
 - k8s-github-robot
+- mrbobbytables
 - nikhita
 - spiffxp
 - thelinuxfoundation
@@ -22,6 +22,7 @@ members:
 - brendandburns
 - bsherman
 - caesarxuchao
+- calebamiles
 - codevulture
 - dims
 - djkonro
@@ -37,7 +38,6 @@ members:
 - lwander
 - mbohlool
 - micw523
-- mrbobbytables
 - pokoli
 - rlenferink
 - roycaihw

diff --git a/config/kubernetes-csi/OWNERS b/config/kubernetes-csi/OWNERS
@@ -2,11 +2,12 @@
 
 reviewers:
   - justaugustus
-  - mrbobbytables
 approvers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
+emeritus_approvers:
+  - calebamiles
diff --git a/config/kubernetes-csi/org.yaml b/config/kubernetes-csi/org.yaml
@@ -5,18 +5,19 @@ has_organization_projects: true
 has_repository_projects: true
 members_can_create_repositories: false
 admins:
-- calebamiles
 - cblecker
 - fejta
 - idvoretskyi
 - k8s-ci-robot
 - k8s-github-robot
+- mrbobbytables
 - nikhita
 - spiffxp
 - thelinuxfoundation
 members:
 - andrewsykim
 - bswartz
+- calebamiles
 - chakri-nelluri
 - childsb
 - codenrhoden
@@ -34,7 +35,6 @@ members:
 - leakingtapan
 - lpabon
 - mlmhl
-- mrbobbytables
 - msau42
 - pohly
 - rlenferink

diff --git a/config/kubernetes-incubator/OWNERS b/config/kubernetes-incubator/OWNERS
@@ -2,11 +2,12 @@
 
 reviewers:
   - justaugustus
-  - mrbobbytables
 approvers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
+emeritus_approvers:
+  - calebamiles
diff --git a/config/kubernetes-incubator/org.yaml b/config/kubernetes-incubator/org.yaml
@@ -5,12 +5,12 @@ has_organization_projects: true
 has_repository_projects: true
 members_can_create_repositories: false
 admins:
-- calebamiles
 - cblecker
 - fejta
 - idvoretskyi
 - k8s-ci-robot
 - k8s-github-robot
+- mrbobbytables
 - nikhita
 - spiffxp
 - thelinuxfoundation
@@ -36,6 +36,7 @@ members:
 - bsalamat
 - cab105
 - caesarxuchao
+- calebamiles
 - carolynvs
 - cdrage
 - chadswen
@@ -108,7 +109,6 @@ members:
 - mikebrow
 - mirwan
 - mistyhacks
-- mrbobbytables
 - MrHohn
 - mrunalp
 - msau42
@@ -222,9 +222,8 @@ teams:
     privacy: closed
   admins-application-images:
     description: Admin access to the application-images repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - mattf
     - zmerlynn
     privacy: closed
@@ -238,10 +237,9 @@ teams:
     privacy: closed
   admins-cluster-proportional-autoscaler:
     description: Admin access to the cluster-proportional-autoscaler repo
-    maintainers:
-    - calebamiles
     members:
     - bowei
+    - calebamiles
     - MrHohn
     - philips
     privacy: closed
@@ -252,9 +250,8 @@ teams:
     privacy: closed
   admins-external-dns:
     description: Admin access to the external-dns repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - justinsb
     - sarahnovotny
     privacy: closed
@@ -268,11 +265,10 @@ teams:
     privacy: closed
   admins-kargo:
     description: Admin access to the kargo repo
-    maintainers:
-    - calebamiles
     members:
     - ant31
     - bogdando
+    - calebamiles
     - mattymo
     - sarahnovotny
     - Smana
@@ -290,23 +286,22 @@ teams:
   admins-kops:
     description: Admin access to the kops repo
     maintainers:
+    members:
     - calebamiles
     privacy: closed
   admins-kube-aws:
     description: Admin access to the kube-aws repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - colhom
     - mumoshu
     - philips
     privacy: closed
   admins-kube2consul:
     description: Admin access to the kube2consul repo
-    maintainers:
-    - calebamiles
     members:
     - bgrant0607
+    - calebamiles
     - elg0nz
     privacy: closed
   admins-metrics-server:
@@ -325,9 +320,8 @@ teams:
     privacy: closed
   admins-rktlet:
     description: Admin access to the rktlet repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - dchen1107
     - euank
     - yifan-gu
@@ -378,9 +372,8 @@ teams:
     privacy: closed
   maintainers-application-images:
     description: Write access to the application-images repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - mattf
     - zmerlynn
     privacy: closed
@@ -412,9 +405,8 @@ teams:
     privacy: closed
   maintainers-cluster-proportional-autoscaler:
     description: Write access to the cluster-proportional-autoscaler repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - MrHohn
     - philips
     privacy: closed
@@ -460,11 +452,10 @@ teams:
     privacy: closed
   maintainers-kargo:
     description: Write access to the kargo repo
-    maintainers:
-    - calebamiles
     members:
     - ant31
     - bogdando
+    - calebamiles
     - mattymo
     - rsmitty
     privacy: closed
@@ -481,14 +472,13 @@ teams:
     privacy: closed
   maintainers-kops:
     description: Write access to the kops repo
-    maintainers:
+    members:
     - calebamiles
     privacy: closed
   maintainers-kube-aws:
     description: Write access to the kube-aws repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - colhom
     - mumoshu
     - pbx0
@@ -497,10 +487,9 @@ teams:
     privacy: closed
   maintainers-kube2consul:
     description: Write access to the kube2consul repo
-    maintainers:
-    - calebamiles
     members:
     - bgrant0607
+    - calebamiles
     - elg0nz
     privacy: closed
   maintainers-metrics-server:
@@ -537,9 +526,8 @@ teams:
     privacy: closed
   maintainers-rktlet:
     description: Write access to the rktlet repo
-    maintainers:
-    - calebamiles
     members:
+    - calebamiles
     - dchen1107
     - euank
     - yifan-gu

diff --git a/config/kubernetes-retired/OWNERS b/config/kubernetes-retired/OWNERS
@@ -1,16 +1,11 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-reviewers:
-  - calebamiles
-  - cblecker
-  - fejta
-  - idvoretskyi
-  - nikhita
-  - spiffxp
 approvers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
+emeritus_approvers:
+  - calebamiles
diff --git a/config/kubernetes-retired/org.yaml b/config/kubernetes-retired/org.yaml
@@ -5,12 +5,12 @@ has_organization_projects: true
 has_repository_projects: true
 members_can_create_repositories: false
 admins:
-- calebamiles
 - cblecker
 - fejta
 - idvoretskyi
 - k8s-ci-robot
 - k8s-github-robot
+- mrbobbytables
 - nikhita
 - spiffxp
 - thelinuxfoundation
diff --git a/config/kubernetes-sigs/OWNERS b/config/kubernetes-sigs/OWNERS
@@ -2,11 +2,12 @@
 
 reviewers:
   - justaugustus
-  - mrbobbytables
 approvers:
-  - calebamiles
   - cblecker
   - fejta
   - idvoretskyi
+  - mrbobbytables
   - nikhita
   - spiffxp
+emeritus_approvers:
+  - calebamiles