From e45708eafac6c1ef62bdbf8b9e5206a1d9e6d068 Mon Sep 17 00:00:00 2001
From: Eric Chiang <eric.chiang.m@gmail.com>
Date: Fri, 19 Jan 2018 09:17:23 -0800
Subject: [PATCH] conformance: use admin kubeconfig

---
 hack/quickstart/init-master.sh | 1 +
 hack/tests/conformance-gce.sh  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hack/quickstart/init-master.sh b/hack/quickstart/init-master.sh
index 52c7c85af..2ad065d06 100755
--- a/hack/quickstart/init-master.sh
+++ b/hack/quickstart/init-master.sh
@@ -75,6 +75,7 @@ function init_master_node() {
     chown -R ${REMOTE_USER}:${REMOTE_USER} /home/${REMOTE_USER}/assets
     mkdir -p /etc/kubernetes
     cp /home/${REMOTE_USER}/assets/auth/kubeconfig-kubelet /etc/kubernetes/kubeconfig
+    cp /home/${REMOTE_USER}/assets/auth/kubeconfig /etc/kubernetes/kubeconfig-admin
     cp /home/${REMOTE_USER}/assets/tls/ca.crt /etc/kubernetes/ca.crt
 
     # Start etcd.
diff --git a/hack/tests/conformance-gce.sh b/hack/tests/conformance-gce.sh
index fd29bd557..59aedea46 100755
--- a/hack/tests/conformance-gce.sh
+++ b/hack/tests/conformance-gce.sh
@@ -94,7 +94,7 @@ if [ "${IN_CONTAINER}" == true ]; then
     init
     add_master
     add_workers
-    KUBECONFIG=/etc/kubernetes/kubeconfig WORKER_COUNT=${WORKER_COUNT} /build/bootkube/hack/tests/conformance-test.sh ${MASTER_IP} 22 /root/.ssh/id_rsa
+    KUBECONFIG=/etc/kubernetes/kubeconfig-admin WORKER_COUNT=${WORKER_COUNT} /build/bootkube/hack/tests/conformance-test.sh ${MASTER_IP} 22 /root/.ssh/id_rsa
 else
     BUILD_ROOT=${BUILD_ROOT:-}
     if [ -z "$BUILD_ROOT" ]; then