From 8bec08177672882af8ca0ecc3586c906ce4b7f08 Mon Sep 17 00:00:00 2001
From: Marek Grabowski <gmarek@google.com>
Date: Tue, 11 Aug 2015 16:29:32 +0200
Subject: [PATCH] Revert "Fix kube-up for GKE. cluster-version is no more."

---
 cluster/gke/util.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh
index 143b95cfa81..1828324a5f7 100755
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -110,6 +110,7 @@ function verify-prereqs() {
 #   GCLOUD
 #   CLUSTER_NAME
 #   ZONE
+#   CLUSTER_API_VERSION (optional)
 #   NUM_MINIONS
 #   MINION_SCOPES
 function kube-up() {
@@ -144,6 +145,11 @@ function kube-up() {
     "--network=${NETWORK}"
     "--scopes=${MINION_SCOPES}"
   )
+  if [[ ! -z "${DOGFOOD_GCLOUD:-}" ]]; then
+    create_args+=("--cluster-version=${CLUSTER_API_VERSION:-}")
+  else
+    create_args+=("--cluster-api-version=${CLUSTER_API_VERSION:-}")
+  fi
 
   # Bring up the cluster.
   "${GCLOUD}" "${CMD_GROUP}" container clusters create "${CLUSTER_NAME}" "${create_args[@]}"