Merge pull request #82380 from robscott/endpointslice-e2e-tests

Starting EndpointSlice Controller when all Alpha gates are enabled in cluster up
kubernetes · Sep 6, 2019 · 3a50184 · 3a50184
2 parents 397ed0e + dc0c81a
commit 3a50184
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
@@ -247,6 +247,7 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 
 if [[ "${KUBE_FEATURE_GATES:-}" == "AllAlpha=true" ]]; then
   RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-api/all=true}"
+  RUN_CONTROLLERS="${RUN_CONTROLLERS:-*,endpointslice}"
 fi
 
 # Optional: set feature gates

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
@@ -136,6 +136,7 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 
 if [[ "${KUBE_FEATURE_GATES:-}" == "AllAlpha=true" ]]; then
   RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-api/all=true}"
+  RUN_CONTROLLERS="${RUN_CONTROLLERS:-*,endpointslice}"
 fi
 
 # Optional: set feature gates

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
@@ -1284,6 +1284,11 @@ EOF
   if [ -n "${FEATURE_GATES:-}" ]; then
     cat >>$file <<EOF
 FEATURE_GATES: $(yaml-quote ${FEATURE_GATES})
+EOF
+  fi
+  if [ -n "${RUN_CONTROLLERS:-}" ]; then
+    cat >>$file <<EOF
+RUN_CONTROLLERS: $(yaml-quote ${RUN_CONTROLLERS})
 EOF
   fi
   if [ -n "${PROVIDER_VARS:-}" ]; then