From 2f94f57692dd24a2eff4d2f182fc9791ffe89237 Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Tue, 15 Aug 2023 17:18:58 +0530 Subject: [PATCH 1/4] config: GH Admin rotation - upgrade org OWNERS and configs Add Priyankasaggu11929 as admin in all orgs and move idvoretskyi to member wherever applicable. Add Priyankasaggu11929 as reviewer and approver in OWNERS of all orgs and move idvoretskyi to emiratus. --- config/kubernetes-client/OWNERS | 4 +++- config/kubernetes-client/org.yaml | 3 ++- config/kubernetes-csi/OWNERS | 4 +++- config/kubernetes-csi/org.yaml | 4 ++-- config/kubernetes-incubator/OWNERS | 3 ++- config/kubernetes-incubator/org.yaml | 2 +- config/kubernetes-nightly/OWNERS | 3 ++- config/kubernetes-nightly/org.yaml | 3 ++- config/kubernetes-retired/OWNERS | 3 ++- config/kubernetes-retired/org.yaml | 2 +- config/kubernetes-sigs/OWNERS | 4 +++- config/kubernetes-sigs/org.yaml | 4 ++-- config/kubernetes/OWNERS | 4 +++- config/kubernetes/org.yaml | 4 ++-- 14 files changed, 30 insertions(+), 17 deletions(-) diff --git a/config/kubernetes-client/OWNERS b/config/kubernetes-client/OWNERS index a7cd4285b8..5bc7a19322 100644 --- a/config/kubernetes-client/OWNERS +++ b/config/kubernetes-client/OWNERS @@ -3,17 +3,19 @@ reviewers: - MadhavJivrajani - palnabarun + - Priyankasaggu11929 - savitharaghunathan approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 - savitharaghunathan emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp diff --git a/config/kubernetes-client/org.yaml b/config/kubernetes-client/org.yaml index 91d1fad847..3c54302502 100644 --- a/config/kubernetes-client/org.yaml +++ b/config/kubernetes-client/org.yaml @@ -1,12 +1,12 @@ admins: - cblecker -- idvoretskyi - k8s-ci-robot - k8s-github-robot - MadhavJivrajani - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - thelinuxfoundation billing_email: github@kubernetes.io default_repository_permission: read @@ -31,6 +31,7 @@ members: - grodrigues3 - iamneha - idealhack +- idvoretskyi - irvifa - ityuhui - jlsong01 diff --git a/config/kubernetes-csi/OWNERS b/config/kubernetes-csi/OWNERS index a7cd4285b8..5bc7a19322 100644 --- a/config/kubernetes-csi/OWNERS +++ b/config/kubernetes-csi/OWNERS @@ -3,17 +3,19 @@ reviewers: - MadhavJivrajani - palnabarun + - Priyankasaggu11929 - savitharaghunathan approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 - savitharaghunathan emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp diff --git a/config/kubernetes-csi/org.yaml b/config/kubernetes-csi/org.yaml index bbe4b82b2a..1f998bda1c 100644 --- a/config/kubernetes-csi/org.yaml +++ b/config/kubernetes-csi/org.yaml @@ -1,12 +1,12 @@ admins: - cblecker -- idvoretskyi - k8s-ci-robot - k8s-github-robot - MadhavJivrajani - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - thelinuxfoundation billing_email: github@kubernetes.io default_repository_permission: read @@ -51,6 +51,7 @@ members: - huffmanca - humblec - idealhack +- idvoretskyi - ihcsim - irvifa - j-griffith @@ -87,7 +88,6 @@ members: - pohly - Pradumnasaraf - prateekpandey14 -- Priyankasaggu11929 - pwschuurman - RaunakShah - rlenferink diff --git a/config/kubernetes-incubator/OWNERS b/config/kubernetes-incubator/OWNERS index 1dbd21591a..2ee47e2559 100644 --- a/config/kubernetes-incubator/OWNERS +++ b/config/kubernetes-incubator/OWNERS @@ -2,13 +2,14 @@ approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp diff --git a/config/kubernetes-incubator/org.yaml b/config/kubernetes-incubator/org.yaml index 3a07178251..3d8b66ac82 100644 --- a/config/kubernetes-incubator/org.yaml +++ b/config/kubernetes-incubator/org.yaml @@ -7,11 +7,11 @@ members_can_create_repositories: false billing_email: github@kubernetes.io admins: - cblecker -- idvoretskyi - k8s-ci-robot - k8s-github-robot - MadhavJivrajani - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - thelinuxfoundation diff --git a/config/kubernetes-nightly/OWNERS b/config/kubernetes-nightly/OWNERS index b7d44da78c..5976a7ac16 100644 --- a/config/kubernetes-nightly/OWNERS +++ b/config/kubernetes-nightly/OWNERS @@ -3,12 +3,13 @@ reviewers: - MadhavJivrajani - palnabarun + - Priyankasaggu11929 - savitharaghunathan approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 - savitharaghunathan diff --git a/config/kubernetes-nightly/org.yaml b/config/kubernetes-nightly/org.yaml index 00f3f5502d..d3c73cd370 100644 --- a/config/kubernetes-nightly/org.yaml +++ b/config/kubernetes-nightly/org.yaml @@ -9,7 +9,6 @@ admins: - cblecker - cpanato - dims -- idvoretskyi - jeremyrickard - justaugustus - k8s-ci-robot @@ -18,12 +17,14 @@ admins: - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - puerco - saschagrunert - sttts - thelinuxfoundation members: - ameukam +- idvoretskyi - k8s-publishing-bot - savitharaghunathan - Verolop diff --git a/config/kubernetes-retired/OWNERS b/config/kubernetes-retired/OWNERS index 1dbd21591a..2ee47e2559 100644 --- a/config/kubernetes-retired/OWNERS +++ b/config/kubernetes-retired/OWNERS @@ -2,13 +2,14 @@ approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp diff --git a/config/kubernetes-retired/org.yaml b/config/kubernetes-retired/org.yaml index ef37c613ea..b29ed92af4 100644 --- a/config/kubernetes-retired/org.yaml +++ b/config/kubernetes-retired/org.yaml @@ -7,11 +7,11 @@ members_can_create_repositories: false billing_email: github@kubernetes.io admins: - cblecker -- idvoretskyi - k8s-ci-robot - k8s-github-robot - MadhavJivrajani - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - thelinuxfoundation diff --git a/config/kubernetes-sigs/OWNERS b/config/kubernetes-sigs/OWNERS index a7cd4285b8..5bc7a19322 100644 --- a/config/kubernetes-sigs/OWNERS +++ b/config/kubernetes-sigs/OWNERS @@ -3,17 +3,19 @@ reviewers: - MadhavJivrajani - palnabarun + - Priyankasaggu11929 - savitharaghunathan approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 - savitharaghunathan emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp diff --git a/config/kubernetes-sigs/org.yaml b/config/kubernetes-sigs/org.yaml index 60d39a96f2..2fb73e96be 100644 --- a/config/kubernetes-sigs/org.yaml +++ b/config/kubernetes-sigs/org.yaml @@ -1,12 +1,12 @@ admins: - cblecker -- idvoretskyi - k8s-ci-robot - k8s-github-robot - MadhavJivrajani - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - thelinuxfoundation billing_email: github@kubernetes.io default_repository_permission: read @@ -386,6 +386,7 @@ members: - ibabou - ibzib - idealhack +- idvoretskyi - imnmo - ingvagabund - inteon @@ -755,7 +756,6 @@ members: - prankul88 - prankulmahajan - pravarag -- Priyankasaggu11929 - prksu - Promaethius - prydonius diff --git a/config/kubernetes/OWNERS b/config/kubernetes/OWNERS index a7cd4285b8..5bc7a19322 100644 --- a/config/kubernetes/OWNERS +++ b/config/kubernetes/OWNERS @@ -3,17 +3,19 @@ reviewers: - MadhavJivrajani - palnabarun + - Priyankasaggu11929 - savitharaghunathan approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 - savitharaghunathan emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp diff --git a/config/kubernetes/org.yaml b/config/kubernetes/org.yaml index f23e170620..9c751d3497 100644 --- a/config/kubernetes/org.yaml +++ b/config/kubernetes/org.yaml @@ -1,12 +1,12 @@ admins: - cblecker -- idvoretskyi - k8s-ci-robot - k8s-github-robot - MadhavJivrajani - mrbobbytables - nikhita - palnabarun +- Priyankasaggu11929 - thelinuxfoundation billing_email: github@kubernetes.io default_repository_permission: read @@ -613,6 +613,7 @@ members: - ibzib - Iceber - idealhack +- idvoretskyi - ihcsim - iheanyi1 - iholder101 @@ -1196,7 +1197,6 @@ members: - presztak - prezha - PriyankaH21 -- Priyankasaggu11929 - PriyanshuAhlawat - priyawadhwa - prksu From 94767cbf086d58d0c53706a2829bbc616fa75304 Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Tue, 15 Aug 2023 17:29:31 +0530 Subject: [PATCH 2/4] config: GH admin rotation - update team configs Move idvoretskyi to members wherever applicable. Add Priyankasaggu11929 as maintainer anew or move from member to maintainer wherever necessary. --- .../sig-contributor-experience/teams.yaml | 3 +-- config/kubernetes/org.yaml | 9 +++---- .../sig-contributor-experience/teams.yaml | 25 ++++++++----------- config/kubernetes/sig-docs/teams.yaml | 3 +-- config/kubernetes/sig-k8s-infra/teams.yaml | 7 +++--- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/config/kubernetes-sigs/sig-contributor-experience/teams.yaml b/config/kubernetes-sigs/sig-contributor-experience/teams.yaml index 6cbe6c597f..5afe2c8d49 100644 --- a/config/kubernetes-sigs/sig-contributor-experience/teams.yaml +++ b/config/kubernetes-sigs/sig-contributor-experience/teams.yaml @@ -81,11 +81,11 @@ teams: description: admin access to the sigs-github-actions repo maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 privacy: closed repos: sigs-github-actions: admin @@ -95,7 +95,6 @@ teams: - cblecker - MadhavJivrajani - nikhita - members: - Priyankasaggu11929 privacy: closed repos: diff --git a/config/kubernetes/org.yaml b/config/kubernetes/org.yaml index 9c751d3497..5b4fffc966 100644 --- a/config/kubernetes/org.yaml +++ b/config/kubernetes/org.yaml @@ -1908,13 +1908,12 @@ teams: dns: write examples: description: Creation and curation of example applications that run on Kubernetes - maintainers: - - idvoretskyi members: - ahmetb - chrislovecnm - erictune - foxish + - idvoretskyi - janetkuo - jaredbhatti - jayunit100 @@ -1924,8 +1923,8 @@ teams: examples-admins: description: Admin access to the examples repo maintainers: - - idvoretskyi members: + - idvoretskyi - sebgoa privacy: closed repos: @@ -1933,9 +1932,9 @@ teams: examples-maintainers: description: Write access to the examples repo maintainers: - - idvoretskyi members: - ahmetb + - idvoretskyi - sebgoa privacy: closed repos: @@ -2177,11 +2176,11 @@ teams: description: Kubernetes GitHub Owners maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 privacy: closed repos: org: admin diff --git a/config/kubernetes/sig-contributor-experience/teams.yaml b/config/kubernetes/sig-contributor-experience/teams.yaml index b082df8066..2bd3c9f749 100644 --- a/config/kubernetes/sig-contributor-experience/teams.yaml +++ b/config/kubernetes/sig-contributor-experience/teams.yaml @@ -3,14 +3,13 @@ teams: description: "" maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 members: - kaslin - - Priyankasaggu11929 privacy: closed repos: community: admin @@ -21,9 +20,9 @@ teams: - MadhavJivrajani - mrbobbytables - nikhita + - Priyankasaggu11929 members: - kaslin - - Priyankasaggu11929 privacy: closed repos: community: write @@ -31,17 +30,18 @@ teams: description: Contributors who can use `/milestone` in the community repo. Defined by an entry in an OWNERS file for a contribex subproject. maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 members: - castrojo - dims - fejta - grodrigues3 - guineveresaenger + - idvoretskyi - jberkus - jdumars - jeefy @@ -50,7 +50,6 @@ teams: - lukaszgryglicki - parispittman - Phillels - - Priyankasaggu11929 - spiffxp - tpepper privacy: closed @@ -90,11 +89,11 @@ teams: Subproject Board maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 members: - ezzoueidi - idealhack @@ -104,9 +103,8 @@ teams: description: Contributors with access to groom issues on org-level project boards. Groups can opt-in to assistance with grooming by adding this team to their project board with admin permissions. - maintainers: - - idvoretskyi members: + - idvoretskyi - jdumars - justaugustus - lachie83 @@ -117,11 +115,11 @@ teams: description: Improve contributor productivity maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 members: - alisondy - castrojo @@ -131,6 +129,7 @@ teams: - grodrigues3 - hongchaodeng - idealhack + - idvoretskyi - jessfraz - kaslin - lavalamp @@ -139,7 +138,6 @@ teams: - philips - Phillels - pigmej - - Priyankasaggu11929 - pwittrock - thockin - xiang90 @@ -167,35 +165,34 @@ teams: - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 members: - jberkus - kaslin - - Priyankasaggu11929 privacy: closed sig-contributor-experience-pr-reviews: description: PR reviews for contributor-experience infrastructure, such as the PR bot, etc. maintainers: - cblecker - - idvoretskyi - MadhavJivrajani - nikhita - palnabarun + - Priyankasaggu11929 members: - idealhack - kaslin - - Priyankasaggu11929 privacy: closed youtube-admins: description: Members who have admin access to the Kubernetes Community YouTube channel. maintainers: - - idvoretskyi - mrbobbytables members: - alejandrox1 - castrojo - ezzoueidi + - idvoretskyi - jbeda - jdumars - jeefy diff --git a/config/kubernetes/sig-docs/teams.yaml b/config/kubernetes/sig-docs/teams.yaml index af74fe908d..ab9314dcae 100644 --- a/config/kubernetes/sig-docs/teams.yaml +++ b/config/kubernetes/sig-docs/teams.yaml @@ -291,10 +291,9 @@ teams: privacy: closed sig-docs-uk-reviews: description: PR reviews for Ukrainian content - maintainers: - - idvoretskyi members: - Arhell + - idvoretskyi - MaxymVlasov - Potapy4 privacy: closed diff --git a/config/kubernetes/sig-k8s-infra/teams.yaml b/config/kubernetes/sig-k8s-infra/teams.yaml index e6566f62e1..93fde43fa6 100644 --- a/config/kubernetes/sig-k8s-infra/teams.yaml +++ b/config/kubernetes/sig-k8s-infra/teams.yaml @@ -14,7 +14,6 @@ teams: description: sig-k8s-infra members maintainers: - cblecker - - idvoretskyi - nikhita members: - ameukam @@ -25,6 +24,7 @@ teams: - cpanato - dims - hh + - idvoretskyi - ixdy - justinsb - listx @@ -46,9 +46,8 @@ teams: privacy: closed k8s-infra-aws-admins: description: granted access to the k8s-infra AWS account - maintainers: - - idvoretskyi members: + - idvoretskyi - justinsb - thockin privacy: closed @@ -56,10 +55,10 @@ teams: description: granted read-only access to the k8s-infra GCP org (excluding secrets) maintainers: - cblecker - - idvoretskyi members: - BobyMCbobs - hh + - idvoretskyi - justinsb - puerco - Riaankl From 5d25706366b7aea5fe42d20ddccc5411b0cafa7d Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Tue, 15 Aug 2023 17:31:34 +0530 Subject: [PATCH 3/4] remove Priyankasaggu11929 from wg-structured-logging teams.yaml --- config/kubernetes/wg-structured-logging/teams.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/kubernetes/wg-structured-logging/teams.yaml b/config/kubernetes/wg-structured-logging/teams.yaml index 72a0ba783c..1384220fe7 100644 --- a/config/kubernetes/wg-structured-logging/teams.yaml +++ b/config/kubernetes/wg-structured-logging/teams.yaml @@ -11,7 +11,6 @@ teams: - mengjiao-liu - navidshaikh - pohly - - Priyankasaggu11929 - serathius - shivanshu1333 - yangjunmyfm192085 From 61f5601c9d4837caf9211da86cc60c04e5221766 Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Tue, 15 Aug 2023 17:34:49 +0530 Subject: [PATCH 4/4] .*: add Priyankasaggu11929 and rotate out idvoretskyi as admin --- Makefile | 2 +- OWNERS | 5 +++-- SECURITY_CONTACTS | 2 +- admin/update.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ed079be006..19299e5b8b 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ GITHUB_TOKEN_PATH ?= TEST_INFRA_PATH ?= $(OUTPUT_DIR)/tmp/test-infra # intentionally hardcoded list to ensure it's high friction to remove someone -ADMINS = cblecker idvoretskyi MadhavJivrajani mrbobbytables nikhita palnabarun +ADMINS = cblecker MadhavJivrajani mrbobbytables nikhita palnabarun Priyankasaggu11931 ORGS = $(shell find ./config -type d -mindepth 1 -maxdepth 1 | cut -d/ -f3) # use absolute path to ./_output, which is .gitignored diff --git a/OWNERS b/OWNERS index 3138329adc..f928b20506 100644 --- a/OWNERS +++ b/OWNERS @@ -2,22 +2,23 @@ reviewers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 approvers: - cblecker - - idvoretskyi - MadhavJivrajani - mrbobbytables - nikhita - palnabarun + - Priyankasaggu11929 emeritus_approvers: - ameukam - calebamiles - fejta + - idvoretskyi - spiffxp labels: diff --git a/SECURITY_CONTACTS b/SECURITY_CONTACTS index ab976a1c4c..1f2c9a275f 100644 --- a/SECURITY_CONTACTS +++ b/SECURITY_CONTACTS @@ -11,8 +11,8 @@ # INSTRUCTIONS AT https://kubernetes.io/security/ cblecker -idvoretskyi MadhavJivrajani mrbobbytables nikhita palnabarun +Priyankasaggu11929 diff --git a/admin/update.sh b/admin/update.sh index f1bf87f6c7..4f3a1874b0 100755 --- a/admin/update.sh +++ b/admin/update.sh @@ -23,11 +23,11 @@ readonly REPO_ROOT readonly admins=( cblecker - idvoretskyi MadhavJivrajani mrbobbytables nikhita palnabarun + Priyankasaggu11929 ) cd "${REPO_ROOT}"