From dc0c81a5f155bb180374fcf45747579ef6acd13c Mon Sep 17 00:00:00 2001
From: Rob Scott <robertjscott@google.com>
Date: Thu, 5 Sep 2019 09:16:13 -0700
Subject: [PATCH] Ensuring endpointslice controller starts up as part of
 cluster up when all alpha feature gates are enabled

---
 cluster/gce/config-default.sh | 1 +
 cluster/gce/config-test.sh    | 1 +
 cluster/gce/util.sh           | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index d8813479169..e5a3a671fd7 100755
--- 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
index 3c382259333..6ab9a4ea9d9 100755
--- 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
index ca3ac4031e7..00f39eed6e1 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1283,6 +1283,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