Merge pull request #845 from ericchiang/conformance-kubeconfig

conformance: use admin kubeconfig

Author: rphillips

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.

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