Merge pull request #25437 from zmerlynn/gke_test_custom_cidr

Automatic merge from submit-queue GKE provider: Add cluster-ipv4-cidr and arbitrary flags cc @roberthbailey @a-robinson @cjcullen  --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/25437)

Merge pull request #25437 from zmerlynn/gke_test_custom_cidr
bf7dad01 · k8s-merge-robot · 9f00ed60 · e42f2011 · bf7dad01
Commit bf7dad01 authored May 10, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

util.sh cluster/gke/util.sh +9 -1

No files found.
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -124,9 +124,11 @@ function validate-cluster {
 #   ZONE
 #   CLUSTER_API_VERSION (optional)
 #   NUM_NODES
-#   ADDITIONAL_ZONES
+#   ADDITIONAL_ZONES (optional)
 #   NODE_SCOPES
 #   MACHINE_TYPE
+#   CLUSTER_IP_RANGE (optional)
+#   GKE_CREATE_FLAGS (optional, space delineated)
 function kube-up() {
  echo "... in gke:kube-up()" >&2
  detect-project >&2
@@ -166,6 +168,12 @@ function kube-up() {
    create_args+=("--additional-zones=${ADDITIONAL_ZONES}")
  fi

+  if [[ ! -z "${CLUSTER_IP_RANGE:-}" ]]; then
+    create_args+=("--cluster-ipv4-cidr=${CLUSTER_IP_RANGE}")
+  fi
+
+  create_args+=( ${GKE_CREATE_FLAGS:-} )
+
  # Bring up the cluster.
  "${GCLOUD}" ${CMD_GROUP:-} container clusters create "${CLUSTER_NAME}" "${create_args[@]}"
 }