Remove GKE hardcoded version

vmware-archive · Oct 2, 2018 · 6f7a1d6 · 6f7a1d6
1 parent 95cbfe2
commit 6f7a1d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ defaults: &defaults
     BUILDER_IMAGE_NAME: kubeless/function-image-builder
     CGO_ENABLED: "0"
     TEST_DEBUG: "1"
-    GKE_VERSION: 1.9.7-gke.5
+    GKE_VERSION: 1.9
     MINIKUBE_VERSION: v0.25.2
     MANIFESTS: kubeless kubeless-non-rbac kubeless-openshift
 exports: &exports

diff --git a/script/start-gke-env.sh b/script/start-gke-env.sh
@@ -2,9 +2,12 @@
 
 CLUSTER=${1:?}
 ZONE=${2:?}
-VERSION=${3:?}
+BRANCH=${3:?}
 ADMIN=${4:?}
 
+# Resolve latest version from a branch
+VERSION=$(gcloud container get-server-config --zone $ZONE --format='yaml(validMasterVersions)' 2> /dev/null | grep $BRANCH | awk '{print $2}' | head -n 1)
+
 function clean() {
     local resource=${1:?}
     kubectl get $resource | awk '{print $1}' | xargs kubectl delete $resource || true