From 1d93a72c5fa8d10b6e04657c6550878070beb1b9 Mon Sep 17 00:00:00 2001
From: Yang Guo <ygg@google.com>
Date: Wed, 3 May 2017 09:27:01 -0700
Subject: [PATCH] Allows passing --enable-kubernetes-alpha to GKE e2e tests

---
 cluster/gke/config-test.sh | 1 +
 cluster/gke/util.sh        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/cluster/gke/config-test.sh b/cluster/gke/config-test.sh
index fea85e3f06..e25d0a2a01 100644
--- a/cluster/gke/config-test.sh
+++ b/cluster/gke/config-test.sh
@@ -19,6 +19,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:-container_vm}"
+ENABLE_KUBERNETES_ALPHA="${KUBE_GKE_ENABLE_KUBERNETES_ALPHA:-}"
 
 KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true}
 
diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh
index 41a50503c3..98fe2335f9 100755
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -135,6 +135,7 @@ function validate-cluster {
 #   HEAPSTER_MACHINE_TYPE (optional)
 #   CLUSTER_IP_RANGE (optional)
 #   GKE_CREATE_FLAGS (optional, space delineated)
+#   ENABLE_KUBERNETES_ALPHA (optional)
 function kube-up() {
   echo "... in gke:kube-up()" >&2
   detect-project >&2
@@ -184,6 +185,10 @@ function kube-up() {
     "--machine-type=${MACHINE_TYPE}"
   )
 
+  if [[ ! -z "${ENABLE_KUBERNETES_ALPHA:-}" ]]; then
+    create_args+=("--enable-kubernetes-alpha")
+  fi
+
   if [[ ! -z "${ADDITIONAL_ZONES:-}" ]]; then
     create_args+=("--additional-zones=${ADDITIONAL_ZONES}")
   fi