github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25437 from zmerlynn/gke_test_custom_cidr

Browse Source 
Automatic merge from submit-queue

GKE provider: Add cluster-ipv4-cidr and arbitrary flags

cc @roberthbailey @a-robinson @cjcullen

<!-- Reviewable:start -->
---
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)
<!-- Reviewable:end -->
This commit is contained in:
k8s-merge-robot 2016-05-10 17:22:18 -07:00
commit bf7dad01a5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gke/util.sh
View File

@ -124,9 +124,11 @@ function validate-cluster {
# ZONE # ZONE
# CLUSTER_API_VERSION (optional) # CLUSTER_API_VERSION (optional)
# NUM_NODES # NUM_NODES
# ADDITIONAL_ZONES # ADDITIONAL_ZONES (optional)
# NODE_SCOPES # NODE_SCOPES
# MACHINE_TYPE # MACHINE_TYPE
# CLUSTER_IP_RANGE (optional)
# GKE_CREATE_FLAGS (optional, space delineated)
function kube-up() { function kube-up() {
echo "... in gke:kube-up()" >&2 echo "... in gke:kube-up()" >&2
detect-project >&2 detect-project >&2
@ -166,6 +168,12 @@ function kube-up() {
create_args+=("--additional-zones=${ADDITIONAL_ZONES}") create_args+=("--additional-zones=${ADDITIONAL_ZONES}")
fi 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. # Bring up the cluster.
"${GCLOUD}" ${CMD_GROUP:-} container clusters create "${CLUSTER_NAME}" "${create_args[@]}" "${GCLOUD}" ${CMD_GROUP:-} container clusters create "${CLUSTER_NAME}" "${create_args[@]}"
} }