For GKE, only use the special kubeconfig location if the file exists.

This will allow Jenkins to keep running after the next gcloud release without needing to make immediate modifications to this file. We can then remove the extra logic at our own convenience.

For GKE, only use the special kubeconfig location if the file exists.
9db0c68e · Robert Bailey · 42aa4ead · 9db0c68e
Commit 9db0c68e authored May 07, 2015 by Robert Bailey
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

kubectl.sh cluster/kubectl.sh +9 -2

No files found.
--- a/cluster/kubectl.sh
+++ b/cluster/kubectl.sh
@@ -100,13 +100,20 @@ elif [[ ! -x "${KUBECTL_PATH}" ]]; then
 fi
 kubectl="${KUBECTL_PATH:-${kubectl}}"
-# GKE stores it's kubeconfig in a separate location.
 if [[ "$KUBERNETES_PROVIDER" == "gke" ]]; then
  detect-project &> /dev/null
  config=(
-    "--kubeconfig=${HOME}/.config/gcloud/kubernetes/kubeconfig"
    "--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
  detect-master > /dev/null
  config=(