From aa32f1b2ce45ce986c7fa0d5d22f3ea6c780ca9d Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Fri, 13 Feb 2015 13:31:50 -0800 Subject: [PATCH] Retry #4337: Make gce kubeconfig context include project --- cluster/gce/util.sh | 2 +- hack/ginkgo-e2e.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index a65676ba24c..0a876fb08a3 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -508,7 +508,7 @@ function kube-up { local kube_auth="kubernetes_auth" local kubectl="${KUBE_ROOT}/cluster/kubectl.sh" - local context="${INSTANCE_PREFIX}" + local context="${PROJECT}_${INSTANCE_PREFIX}" local user="${INSTANCE_PREFIX}-admin" local config_dir="${HOME}/.kube/${context}" diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index 5860ad17346..b6a32f62dc4 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -93,7 +93,7 @@ elif [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then ) elif [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then auth_config=( - "--auth_config=${HOME}/.kube/${INSTANCE_PREFIX}/kubernetes_auth" + "--auth_config=${HOME}/.kube/${PROJECT}_${INSTANCE_PREFIX}/kubernetes_auth" ) else auth_config=()