diff --git a/cluster/gke/config-common.sh b/cluster/gke/config-common.sh index e88d865fcb8..3f6e7860802 100644 --- a/cluster/gke/config-common.sh +++ b/cluster/gke/config-common.sh @@ -30,6 +30,7 @@ CMD_GROUP="${CMD_GROUP:-}" GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}" NODE_SCOPES="${NODE_SCOPES:-"compute-rw,storage-ro"}" MACHINE_TYPE="${MACHINE_TYPE:-n1-standard-2}" +IMAGE_TYPE="${IMAGE_TYPE:-}" # WARNING: any new vars added here must correspond to options that can be # passed to `gcloud {CMD_GROUP} container clusters create`, or they will diff --git a/cluster/gke/config-test.sh b/cluster/gke/config-test.sh index d29e2250039..f32a163ac97 100644 --- a/cluster/gke/config-test.sh +++ b/cluster/gke/config-test.sh @@ -18,6 +18,7 @@ CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke-e2e}" NETWORK=${KUBE_GKE_NETWORK:-e2e} NODE_TAG="k8s-${CLUSTER_NAME}-node" +IMAGE_TYPE="${KUBE_GKE_IMAGE_TYPE:-}" # For ease of maintenance, extract any pieces that do not vary between default diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index 77bcd006625..5b21e40dd8e 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -172,6 +172,10 @@ function kube-up() { create_args+=("--cluster-ipv4-cidr=${CLUSTER_IP_RANGE}") fi + if [[ ! -z "${IMAGE_TYPE:-}" ]]; then + create_args+=("--image-type=${IMAGE_TYPE}") + fi + create_args+=( ${GKE_CREATE_FLAGS:-} ) # Bring up the cluster.