github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7921 from roberthbailey/gke-kubeconfig

Browse Source 
Stop setting a GKE specific version of the kubeconfig file
This commit is contained in:
Jeff Lowdermilk 2015-05-08 19:48:49 -07:00
commit 051288c4ee
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/kubectl.sh
View File

@ -100,13 +100,20 @@ elif [[ ! -x "${KUBECTL_PATH}" ]]; then
fi fi
kubectl="${KUBECTL_PATH:-${kubectl}}" kubectl="${KUBECTL_PATH:-${kubectl}}"
# GKE stores it's kubeconfig in a separate location.
if [[ "$KUBERNETES_PROVIDER" == "gke" ]]; then if [[ "$KUBERNETES_PROVIDER" == "gke" ]]; then
detect-project &> /dev/null detect-project &> /dev/null
config=( config=(
"--kubeconfig=${HOME}/.config/gcloud/kubernetes/kubeconfig"
"--context=gke_${PROJECT}_${ZONE}_${CLUSTER_NAME}" "--context=gke_${PROJECT}_${ZONE}_${CLUSTER_NAME}"
) )
# In gcloud versions prior to 0.9.59, GKE stores it's kubeconfig
# in a separate location. If the file doesn't exist, then use
# the default kubeconfig file.
# TODO(roberthbailey): Remove this once gcloud 0.9.59 is released.
if [[ ! -e "${HOME}/.config/gcloud/kubernetes/kubeconfig" ]]; then
config+=(
"--kubeconfig=${HOME}/.config/gcloud/kubernetes/kubeconfig"
)
fi
elif [[ "$KUBERNETES_PROVIDER" == "ubuntu" ]]; then elif [[ "$KUBERNETES_PROVIDER" == "ubuntu" ]]; then
detect-master > /dev/null detect-master > /dev/null
config=( config=(