Merge pull request #31926 from girishkalele/e2e-alpha-gate

Automatic merge from submit-queue Propagate KUBE_FEATURE_GATES environment variable to e2e environment This is needed for the Jenkins `kubernetes-e2e-gce-alpha-features` job to pass - there is a small fix needed for cluster/gce/config-test.sh.

Merge pull request #31926 from girishkalele/e2e-alpha-gate
c9fda51d · Kubernetes Submit Queue · GitHub · 25ef0edf · 5d7d02b5 · c9fda51d
Commit c9fda51d authored Sep 01, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

config-test.sh cluster/gce/config-test.sh +4 -0

No files found.
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -62,6 +62,10 @@ NODE_TAG="${INSTANCE_PREFIX}-minion"
 CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.180.0.0/14}"
 MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
+
+# Optional: set feature gates
+FEATURE_GATES="${KUBE_FEATURE_GATES:-}"
+
 TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}

 # Extra docker options for nodes.