Merge pull request #45309 from yguo0905/gke-ubuntu-test

Automatic merge from submit-queue (batch tested with PRs 45309, 45376) Allow passing --enable-kubernetes-alpha to GKE e2e tests **What this PR does / why we need it**: This allows us to pass --enable-kubernetes-alpha when running GKE e2e tests. **Release note**: ``` NONE ``` @dchen1107

Merge pull request #45309 from yguo0905/gke-ubuntu-test
3ae08b83 · Kubernetes Submit Queue · GitHub · 97295740 · 1d93a72c · 3ae08b83
Commit 3ae08b83 authored May 04, 2017 by Kubernetes Submit Queue Committed by GitHub May 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

config-test.sh cluster/gke/config-test.sh +1 -0

util.sh cluster/gke/util.sh +5 -0

No files found.
--- 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}


--- 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