Retry #4337: Make gce kubeconfig context include project

This commit is contained in:
Jeff Lowdermilk 2015-02-13 13:31:50 -08:00
parent c977a45864
commit aa32f1b2ce
2 changed files with 2 additions and 2 deletions

View File

@ -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}"

View File

@ -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=()