From 69e051404fc0589af5ca27cc73ee362ff6ffe69b Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Mon, 10 Jun 2019 10:00:36 -0700 Subject: [PATCH] Rotate calebamiles for mrbobbytables in github admin team Changes are in three categories: - OWNERS: reviewer -> approver - org.yaml: member -> admin - teams.yaml: member -> maintainer We'd rather there be no team maintainers, but GitHub requires that people with Owner permission be listed as maintainers. --- OWNERS | 9 +++- admin/BUILD.bazel | 2 +- config/kubernetes-client/OWNERS | 5 +- config/kubernetes-client/org.yaml | 4 +- config/kubernetes-csi/OWNERS | 5 +- config/kubernetes-csi/org.yaml | 4 +- config/kubernetes-incubator/OWNERS | 5 +- config/kubernetes-incubator/org.yaml | 46 +++++++------------ config/kubernetes-retired/OWNERS | 11 ++--- config/kubernetes-retired/org.yaml | 2 +- config/kubernetes-sigs/OWNERS | 5 +- config/kubernetes-sigs/org.yaml | 14 +++--- .../sig-contributor-experience/teams.yaml | 6 ++- config/kubernetes-sigs/sig-release/teams.yaml | 3 +- config/kubernetes/OWNERS | 5 +- config/kubernetes/org.yaml | 12 ++--- .../kubernetes/sig-cloud-provider/teams.yaml | 33 +++++-------- .../sig-contributor-experience/teams.yaml | 8 ++-- config/kubernetes/sig-pm/teams.yaml | 7 ++- config/kubernetes/sig-release/teams.yaml | 19 ++++---- 20 files changed, 91 insertions(+), 114 deletions(-) diff --git a/OWNERS b/OWNERS index ec550084bf..5885659f40 100644 --- 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 index ca95da4f17..9e96fab898 100644 --- 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/kubernetes-client/OWNERS b/config/kubernetes-client/OWNERS index c3ce9d95c9..800914e17a 100644 --- 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 index 6132898901..d7471f16da 100644 --- 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 index c3ce9d95c9..800914e17a 100644 --- 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 index 6e92cdf9ad..f10a9ea7fc 100644 --- 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 index c3ce9d95c9..800914e17a 100644 --- 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 index 65a6f537c6..aa90bdd79e 100644 --- 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 index ec550084bf..4d217c4d3e 100644 --- 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 index 020f7463d2..501147181b 100644 --- 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 index c3ce9d95c9..800914e17a 100644 --- 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 diff --git a/config/kubernetes-sigs/org.yaml b/config/kubernetes-sigs/org.yaml index 476f3e02b7..749d702061 100644 --- a/config/kubernetes-sigs/org.yaml +++ b/config/kubernetes-sigs/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 @@ -46,6 +46,7 @@ members: - brancz - bryk - caesarxuchao +- calebamiles - carolynvs - castrojo - chadswen @@ -176,7 +177,6 @@ members: - Monkeyanator - monopole - morvencao -- mrbobbytables - mrunalp - msau42 - mszostok @@ -365,18 +365,18 @@ teams: kube-batch-admins: description: Admin access to the kube-batch repo maintainers: - - calebamiles - spiffxp members: + - calebamiles - k82cn - timothysc privacy: closed kube-batch-maintainers: description: Write access to the kube-batch repo maintainers: - - calebamiles - spiffxp members: + - calebamiles - k82cn - timothysc privacy: closed @@ -422,18 +422,18 @@ teams: privacy: closed mutating-trace-admission-controller: description: Parent team for mutating-trace-admission-controller repo (maintainers, admins) - maintainers: + members: - calebamiles privacy: closed teams: mutating-trace-admission-controller-admins: description: Admin access to the mutating-trace-admission-controller repo - maintainers: + members: - calebamiles privacy: closed mutating-trace-admission-controller-maintainers: description: Write access to the mutating-trace-admission-controller repo - maintainers: + members: - calebamiles privacy: closed node-feature-discovery-admins: diff --git a/config/kubernetes-sigs/sig-contributor-experience/teams.yaml b/config/kubernetes-sigs/sig-contributor-experience/teams.yaml index 257d98e832..6968074bb7 100644 --- a/config/kubernetes-sigs/sig-contributor-experience/teams.yaml +++ b/config/kubernetes-sigs/sig-contributor-experience/teams.yaml @@ -1,15 +1,17 @@ teams: contributor-site-admins: description: admin access to contributor-site + maintainers: + - mrbobbytables members: - castrojo - - mrbobbytables privacy: closed contributor-site-maintainers: description: write access to contributor-site + maintainers: + - mrbobbytables members: - castrojo - - mrbobbytables privacy: closed slack-infra-admins: description: admin access to slack-infra diff --git a/config/kubernetes-sigs/sig-release/teams.yaml b/config/kubernetes-sigs/sig-release/teams.yaml index 2483fda0c0..093b43d036 100644 --- a/config/kubernetes-sigs/sig-release/teams.yaml +++ b/config/kubernetes-sigs/sig-release/teams.yaml @@ -24,9 +24,8 @@ teams: privacy: closed release-notes-maintainers: description: write access to release-notes - maintainers: - - calebamiles members: + - calebamiles - jeefy - justaugustus - marpaia diff --git a/config/kubernetes/OWNERS b/config/kubernetes/OWNERS index c3ce9d95c9..800914e17a 100644 --- a/config/kubernetes/OWNERS +++ b/config/kubernetes/OWNERS @@ -2,11 +2,12 @@ reviewers: - justaugustus - - mrbobbytables approvers: - - calebamiles - cblecker - fejta - idvoretskyi + - mrbobbytables - nikhita - spiffxp +emeritus_approvers: + - calebamiles diff --git a/config/kubernetes/org.yaml b/config/kubernetes/org.yaml index 492f2a9a93..74f6d20630 100644 --- a/config/kubernetes/org.yaml +++ b/config/kubernetes/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 @@ -121,6 +121,7 @@ members: - burmanm - cab105 - caesarxuchao +- calebamiles - cameronbrunner - caniszczyk - cantbewong @@ -579,7 +580,6 @@ members: - mortent - mqliang - mr-linus -- mrbobbytables - mrhillsman - MrHohn - mrunalp @@ -972,18 +972,16 @@ teams: privacy: closed cloud-provider-gcp-admins: description: Admin access to cloud-provider-gcp repo - maintainers: - - calebamiles members: - awly + - calebamiles - mikedanese privacy: closed cloud-provider-gcp-maintainers: description: Write access to cloud-provider-gcp repo - maintainers: - - calebamiles members: - awly + - calebamiles - mikedanese privacy: closed cloud-provider-openstack-admins: @@ -1671,10 +1669,10 @@ teams: owners: description: Kubernetes GitHub Owners maintainers: - - calebamiles - cblecker - fejta - idvoretskyi + - mrbobbytables - nikhita - spiffxp privacy: closed diff --git a/config/kubernetes/sig-cloud-provider/teams.yaml b/config/kubernetes/sig-cloud-provider/teams.yaml index fe4c7573f6..3c4c506226 100644 --- a/config/kubernetes/sig-cloud-provider/teams.yaml +++ b/config/kubernetes/sig-cloud-provider/teams.yaml @@ -1,10 +1,9 @@ teams: sig-cloud-provider: description: Parent Team for SIG Cloud Provider - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - cheftako - hogepodge - jagosan @@ -18,19 +17,17 @@ teams: teams: cloud-provider-sample-admins: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - cheftako - mcrute privacy: closed cloud-provider-sample-maintainers: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - cheftako - mcrute privacy: closed @@ -43,46 +40,41 @@ teams: privacy: closed sig-cloud-provider-api-reviews: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan privacy: closed sig-cloud-provider-bugs: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan privacy: closed sig-cloud-provider-feature-requests: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan privacy: closed sig-cloud-provider-misc: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan privacy: closed sig-cloud-provider-pr-reviews: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan - nckturner @@ -90,26 +82,23 @@ teams: privacy: closed sig-cloud-provider-proposals: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan privacy: closed sig-cloud-provider-test-failures: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles - hogepodge - jagosan privacy: closed sig-cloud-provider-admins: description: "" - maintainers: - - calebamiles members: - andrewsykim + - calebamiles privacy: closed diff --git a/config/kubernetes/sig-contributor-experience/teams.yaml b/config/kubernetes/sig-contributor-experience/teams.yaml index 95e638afa4..9ef3b8e51f 100644 --- a/config/kubernetes/sig-contributor-experience/teams.yaml +++ b/config/kubernetes/sig-contributor-experience/teams.yaml @@ -2,12 +2,12 @@ teams: community-admins: description: "" maintainers: - - calebamiles - cblecker - idvoretskyi - nikhita members: - bgrant0607 + - calebamiles - castrojo - grodrigues3 - jdumars @@ -29,13 +29,14 @@ teams: community-milestone-maintainers: description: Contributors who can use `/milestone` in the community repo. Defined by an entry in an OWNERS file for a contribex subproject. maintainers: - - calebamiles - cblecker - fejta - idvoretskyi + - mrbobbytables - nikhita - spiffxp members: + - calebamiles - castrojo - dims - grodrigues3 @@ -45,7 +46,6 @@ teams: - jeefy - justaugustus - lukaszgryglicki - - mrbobbytables - parispittman - Phillels - tpepper @@ -134,13 +134,13 @@ teams: YouTube channel. maintainers: - idvoretskyi + - mrbobbytables members: - alejandrox1 - castrojo - jbeda - jdumars - jeefy - - mrbobbytables - parispittman - sarahnovotny privacy: closed diff --git a/config/kubernetes/sig-pm/teams.yaml b/config/kubernetes/sig-pm/teams.yaml index a4957666f9..3e2120194a 100644 --- a/config/kubernetes/sig-pm/teams.yaml +++ b/config/kubernetes/sig-pm/teams.yaml @@ -2,9 +2,9 @@ teams: enhancements-maintainers: description: Contributors with write access to k/enhancements maintainers: - - calebamiles - idvoretskyi members: + - calebamiles - jdumars - justaugustus - lachie83 @@ -13,9 +13,8 @@ teams: privacy: closed kep-maintainers: description: KEP Process Owners - maintainers: - - calebamiles members: + - calebamiles - jdumars - justaugustus - lachie83 @@ -37,9 +36,9 @@ teams: sig-pm: description: Members of SIG PM. maintainers: - - calebamiles - idvoretskyi members: + - calebamiles - craiglpeters - jdumars - justaugustus diff --git a/config/kubernetes/sig-release/teams.yaml b/config/kubernetes/sig-release/teams.yaml index e876a67daf..ff2c2eab79 100644 --- a/config/kubernetes/sig-release/teams.yaml +++ b/config/kubernetes/sig-release/teams.yaml @@ -3,10 +3,9 @@ teams: description: Kubernetes Build Admins are the current set of Googlers with access to publish packages (debs/rpms) on behalf of the Kubernetes project. This team is a notification-only group, which includes the SIG Release Chairs for continuity. - maintainers: - - calebamiles members: - aleksandra-malinowska + - calebamiles - justaugustus - listx - sumitranr @@ -26,10 +25,10 @@ teams: This team also grants write access to the kubernetes/enhancements repo to allow editing of descriptions for Enhancement tracking issues. maintainers: - - calebamiles # Release / PM - cblecker # ContribEx - fejta # Testing - idvoretskyi # PM + - mrbobbytables # 1.15 Enhancements Shadow - nikhita # ContribEx - spiffxp # Testing members: @@ -41,6 +40,7 @@ teams: - brancz # Instrumentation - bsalamat # Scheduling - bubblemelon # 1.15 Branch Manager + - calebamiles # Release / PM - carolynvs # Service Catalog - caseydavenport # Network - castrojo # 1.15 Communications @@ -88,7 +88,6 @@ teams: - mattfarina # Apps / Architecture - michmike # Windows - mikedanese # Auth - - mrbobbytables # 1.15 Enhancements Shadow - mwielgus # Autoscaling - neolit123 # Cluster Lifecycle - nikopen # 1.15 Lead Shadow @@ -139,10 +138,9 @@ teams: privacy: closed release-engineering: description: Members of the Release Engineering subproject. - maintainers: - - calebamiles # subproject owner members: - aleksandra-malinowska # subproject owner + - calebamiles # subproject owner - hoegaarden # subproject owner - ixdy # subproject owner - tpepper # subproject owner @@ -165,6 +163,7 @@ teams: release-team: description: Members of the current Release Team and subproject owners. maintainers: + - mrbobbytables # 1.15 Enhancements Shadow - spiffxp # subproject owner members: - aishsundar # subproject owner @@ -187,7 +186,6 @@ teams: - lachie83 # 1.15 RT Lead Shadow - MAKOSCAFEE # 1.15 Docs Lead - mariantalla # 1.15 Test Infra Shadow - - mrbobbytables # 1.15 Enhancements Shadow - nickchase # 1.15 Release Notes Shadow - nikopen # 1.15 RT Lead Shadow - onyiny-ang # 1.15 Release Notes Lead @@ -213,7 +211,7 @@ teams: sig-release: description: SIG Release Members maintainers: - - calebamiles + - mrbobbytables - spiffxp members: - abgworrall @@ -223,6 +221,7 @@ teams: - BenTheElder - Bradamant3 - caesarxuchao + - calebamiles - chenopis - cjwagner - claurence @@ -257,7 +256,6 @@ teams: - mistyhacks - mohammedzee1000 - monopole - - mrbobbytables - nickchase - nikopen - nwoods3 @@ -275,9 +273,8 @@ teams: teams: sig-release-admins: description: Admins for SIG Release repositories - maintainers: - - calebamiles members: + - calebamiles - justaugustus - tpepper privacy: closed