From 90b345c49ffae0664b6bd303ed454568aa046179 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Wed, 20 Feb 2019 14:16:41 -0800
Subject: [PATCH] Add k8s-github-robot alongside k8s-ci-robot in all orgs

---
 config/kubernetes-client/org.yaml    | 1 +
 config/kubernetes-csi/org.yaml       | 1 +
 config/kubernetes-incubator/org.yaml | 1 +
 config/kubernetes-retired/org.yaml   | 1 +
 config/kubernetes-sigs/org.yaml      | 2 ++
 config/kubernetes/org.yaml           | 4 ++--
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/kubernetes-client/org.yaml b/config/kubernetes-client/org.yaml
index 38071116bd..0bb1dbb57c 100644
--- a/config/kubernetes-client/org.yaml
+++ b/config/kubernetes-client/org.yaml
@@ -10,6 +10,7 @@ admins:
 - fejta
 - idvoretskyi
 - k8s-ci-robot
+- k8s-github-robot
 - nikhita
 - spiffxp
 - thelinuxfoundation
diff --git a/config/kubernetes-csi/org.yaml b/config/kubernetes-csi/org.yaml
index d61090d2d2..bfe2a77dba 100644
--- a/config/kubernetes-csi/org.yaml
+++ b/config/kubernetes-csi/org.yaml
@@ -10,6 +10,7 @@ admins:
 - fejta
 - idvoretskyi
 - k8s-ci-robot
+- k8s-github-robot
 - nikhita
 - spiffxp
 - thelinuxfoundation
diff --git a/config/kubernetes-incubator/org.yaml b/config/kubernetes-incubator/org.yaml
index 447a373c97..5e763149b5 100644
--- a/config/kubernetes-incubator/org.yaml
+++ b/config/kubernetes-incubator/org.yaml
@@ -10,6 +10,7 @@ admins:
 - fejta
 - idvoretskyi
 - k8s-ci-robot
+- k8s-github-robot
 - nikhita
 - spiffxp
 - thelinuxfoundation
diff --git a/config/kubernetes-retired/org.yaml b/config/kubernetes-retired/org.yaml
index 5ae5a46018..020f7463d2 100644
--- a/config/kubernetes-retired/org.yaml
+++ b/config/kubernetes-retired/org.yaml
@@ -10,6 +10,7 @@ admins:
 - fejta
 - idvoretskyi
 - k8s-ci-robot
+- k8s-github-robot
 - nikhita
 - spiffxp
 - thelinuxfoundation
diff --git a/config/kubernetes-sigs/org.yaml b/config/kubernetes-sigs/org.yaml
index 35dd97af22..abc5fe4719 100644
--- a/config/kubernetes-sigs/org.yaml
+++ b/config/kubernetes-sigs/org.yaml
@@ -10,6 +10,7 @@ admins:
 - fejta
 - idvoretskyi
 - k8s-ci-robot
+- k8s-github-robot
 - nikhita
 - spiffxp
 - thelinuxfoundation
@@ -257,6 +258,7 @@ teams:
     description: Bot Service Accounts in the Kubernetes-SIGs org
     maintainers:
     - k8s-ci-robot
+    - k8s-github-robot
     - thelinuxfoundation
     privacy: closed
   cluster-api-admins:
diff --git a/config/kubernetes/org.yaml b/config/kubernetes/org.yaml
index edefc5a2b7..18360c8461 100644
--- a/config/kubernetes/org.yaml
+++ b/config/kubernetes/org.yaml
@@ -10,7 +10,7 @@ admins:
 - fejta
 - idvoretskyi
 - k8s-ci-robot
-- k8s-merge-robot
+- k8s-github-robot
 - nikhita
 - spiffxp
 - thelinuxfoundation
@@ -864,7 +864,7 @@ teams:
     description: Bot Service Accounts in the Kubernetes org
     maintainers:
     - k8s-ci-robot
-    - k8s-merge-robot
+    - k8s-github-robot
     - thelinuxfoundation
     members:
     - k8s-publishing-bot