From 3b9e20a96eb69630020a89d778712274925a51a0 Mon Sep 17 00:00:00 2001
From: "Yuan (Bob) Gong" <4957653+Bobgy@users.noreply.github.com>
Date: Tue, 25 Jan 2022 01:05:50 +0800
Subject: [PATCH] Transition of Bobgy (#524)

---
 OWNERS                                          |  3 +--
 gcp_iam_policies/OWNERS                         |  1 -
 github-orgs/OWNERS                              |  1 -
 github-orgs/kubeflow/org.yaml                   | 11 ++++-------
 github-orgs/manifests/github-sync-cron-job.yaml |  1 -
 github-orgs/manifests/github-sync-job.yaml      |  1 -
 github-orgs/sync_org.sh                         |  1 -
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/OWNERS b/OWNERS
index abd7ebf2b4a..1bd4975f9ff 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,8 +1,7 @@
 approvers:
-  - bobgy
+  - chensun
   - james-jwu
   - neuromage
   - zijianjoy
 reviewers:
-  - bobgy
   - zijianjoy
diff --git a/gcp_iam_policies/OWNERS b/gcp_iam_policies/OWNERS
index 1ef8d58ab41..7ffb55c3b5d 100644
--- a/gcp_iam_policies/OWNERS
+++ b/gcp_iam_policies/OWNERS
@@ -1,4 +1,3 @@
 reviewers:
-  - bobgy
   - capri-xiyue
   - zijianjoy
diff --git a/github-orgs/OWNERS b/github-orgs/OWNERS
index 1ef8d58ab41..7ffb55c3b5d 100644
--- a/github-orgs/OWNERS
+++ b/github-orgs/OWNERS
@@ -1,4 +1,3 @@
 reviewers:
-  - bobgy
   - capri-xiyue
   - zijianjoy
diff --git a/github-orgs/kubeflow/org.yaml b/github-orgs/kubeflow/org.yaml
index b24d571844a..ea3381918cf 100644
--- a/github-orgs/kubeflow/org.yaml
+++ b/github-orgs/kubeflow/org.yaml
@@ -5,7 +5,7 @@
 orgs:
     kubeflow:
         admins:
-        - Bobgy
+        - Bobgy # TODO(Bobgy): migrate github-sync cronjob and remove me from admins
         - chensun
         - google-admin
         - google-oss-robot
@@ -624,7 +624,6 @@ orgs:
             - avdaredevil
             - BenTheElder
             - bhupc
-            - Bobgy
             - capri-xiyue
             - chensun
             - chrisheecho
@@ -665,7 +664,6 @@ orgs:
           google-admins:
             description: Googlers to ping for help regarding Kubeflow's GitHub org and Google Groups
             members:
-            - Bobgy
             - chensun
             - james-jwu
             - neuromage
@@ -886,8 +884,8 @@ orgs:
           oncall-testing:
             description: Maintainers of `kubeflow/testing`
             members:
-            - Bobgy
             - PatrickXYS
+            - zijianjoy
             privacy: closed
             repos:
               testing: write
@@ -896,7 +894,6 @@ orgs:
             members:
             - alinakuz
             - Ark-kun
-            - Bobgy
             - capri-xiyue
             - dushyanthsc
             - hilcj
@@ -918,7 +915,7 @@ orgs:
           project-steering-group:
             description: Project Steering Group; Defined by Kubeflow governance
             members:
-            - Bobgy
+            - james-jwu
             - paveldournov
             - theadactyl
           release-managers:
@@ -1001,7 +998,7 @@ orgs:
             description: Team of Pipeline Working Group leads
             members:
             - animeshsingh
-            - Bobgy
+            - chensun
             - james-jwu
             - kramachandran
             - neuromage
diff --git a/github-orgs/manifests/github-sync-cron-job.yaml b/github-orgs/manifests/github-sync-cron-job.yaml
index f8c98b0d694..e612614c0c9 100644
--- a/github-orgs/manifests/github-sync-cron-job.yaml
+++ b/github-orgs/manifests/github-sync-cron-job.yaml
@@ -57,7 +57,6 @@ spec:
             - --fix-team-repos
             - --config-path=/src/kubeflow/internal-acls/github-orgs/kubeflow/org.yaml
             - --github-token-path=/secret/github-token/github_token
-            - --required-admins=Bobgy
             - --required-admins=james-jwu
             - --required-admins=google-admin
             - --required-admins=googlebot
diff --git a/github-orgs/manifests/github-sync-job.yaml b/github-orgs/manifests/github-sync-job.yaml
index 9cf4e6ccf47..c6c01a9594f 100644
--- a/github-orgs/manifests/github-sync-job.yaml
+++ b/github-orgs/manifests/github-sync-job.yaml
@@ -53,7 +53,6 @@ spec:
         - --fix-team-repos
         - --config-path=/src/kubeflow/internal-acls/github-orgs/kubeflow/org.yaml
         - --github-token-path=/secret/github-token/github_token
-        - --required-admins=Bobgy
         - --required-admins=james-jwu
         - --required-admins=google-admin
         - --required-admins=googlebot
diff --git a/github-orgs/sync_org.sh b/github-orgs/sync_org.sh
index 0cbe47267d1..1aaced33dae 100755
--- a/github-orgs/sync_org.sh
+++ b/github-orgs/sync_org.sh
@@ -69,7 +69,6 @@ elif [ "${action}" == "sync" ]; then
 		--fix-team-members \
 		--fix-org-members ${FIX_ADMINS} --config-path ${DIR}/kubeflow/org.yaml \
 		--github-token-path ${token_file} \
-		--required-admins=Bobgy \
 		--required-admins=james-jwu \
 		--required-admins=google-admin \
 		--required-admins=googlebot \