Merge pull request #961 from sttts/sttts-auto-publish

workloads: make --auto-publish-apis default to on
kcp-dev · May 3, 2022 · a843d56 · a843d56
2 parents 9a804fa + 650ee4f
commit a843d56
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 10 deletions.
diff --git a/contrib/demo/ingress-script/startKcp.sh b/contrib/demo/ingress-script/startKcp.sh
@@ -33,7 +33,6 @@ fi
 
 "${DEMOS_DIR}"/startKcp.sh \
     --push-mode \
-    --auto-publish-apis=true \
     --resources-to-sync "ingresses.networking.k8s.io,deployments.apps,services" &
 
 wait_command "test -f ${KCP_DATA_DIR}/kcp-started"

diff --git a/contrib/demo/kubecon-script/startKcp.sh b/contrib/demo/kubecon-script/startKcp.sh
@@ -25,7 +25,6 @@ KUBECONFIG=${KCP_DATA_DIR}/.kcp/admin.kubeconfig
 
 "${DEMOS_DIR}"/startKcp.sh \
     --push-mode \
-    --auto-publish-apis=true \
     --resources-to-sync deployments.apps &
 
 wait_command "test -f ${KCP_DATA_DIR}/kcp-started"

diff --git a/contrib/demo/prototype2-script/startKcp.sh b/contrib/demo/prototype2-script/startKcp.sh
@@ -71,7 +71,6 @@ fi
 
 "${DEMOS_DIR}"/startKcp.sh \
     --token-auth-file "${DEMO_DIR}"/kcp-tokens \
-    --auto-publish-apis \
     --push-mode \
     --discovery-poll-interval 3s \
     --profiler-address localhost:6060 \

diff --git a/contrib/demo/prototype3-script/startKcp.sh b/contrib/demo/prototype3-script/startKcp.sh
@@ -64,7 +64,6 @@ KUBECONFIG=${KCP_DATA_DIR}/.kcp/admin.kubeconfig
 
 "${DEMOS_DIR}"/startKcp.sh \
     --token-auth-file "${DEMO_DIR}"/kcp-tokens \
-    --auto-publish-apis \
     --push-mode \
     --discovery-poll-interval 3s \
     --profiler-address localhost:6060 \

diff --git a/contrib/demo/sharding/run.sh b/contrib/demo/sharding/run.sh
@@ -57,7 +57,7 @@ done
 echo
 
 echo "Starting Cluster Controller on kcp1..."
-"${KCP_ROOT}"/bin/cluster-controller -push-mode=true -pull-mode=false -kubeconfig=".kcp1/admin.kubeconfig" -auto-publish-apis=true .configmaps &> .kcp1.cluster-controller.log 2>&1 &
+"${KCP_ROOT}"/bin/cluster-controller -push-mode=true -pull-mode=false -kubeconfig=".kcp1/admin.kubeconfig" .configmaps &> .kcp1.cluster-controller.log 2>&1 &
 
 echo "Starting kcp2..."
 "${KCP_ROOT}"/bin/kcp start --enable-sharding --shard-kubeconfig-file ".kcp1/data/shard.kubeconfig" --root-directory ".kcp2" --etcd-client-port 2381 --etcd-peer-port 2382 --secure-port :6444 > ".kcp2.log" 2>&1 &
@@ -81,7 +81,7 @@ done
 echo
 
 echo "Starting Cluster Controller on kcp2..."
-"${KCP_ROOT}"/bin/cluster-controller -push-mode=true -pull-mode=false -kubeconfig=".kcp1/admin.kubeconfig" -auto-publish-apis=true .configmaps &> .kcp1.cluster-controller.log 2>&1 &
+"${KCP_ROOT}"/bin/cluster-controller -push-mode=true -pull-mode=false -kubeconfig=".kcp1/admin.kubeconfig" .configmaps &> .kcp1.cluster-controller.log 2>&1 &
 
 "${KCP_ROOT}"/contrib/demo/sharding/add-cluster.py ".kcp1/admin.kubeconfig" ".kcp2/admin.kubeconfig"
 touch .ready

diff --git a/contrib/demo/workspaceKubectlPlugin-script/startKcp.sh b/contrib/demo/workspaceKubectlPlugin-script/startKcp.sh
@@ -26,7 +26,6 @@ setupTraps "$0"
 KUBECONFIG=${KCP_DATA_DIR}/.kcp/admin.kubeconfig
 "${DEMOS_DIR}"/startKcp.sh \
     --push-mode \
-    --auto-publish-apis=true \
     --resources-to-sync deployments.apps \
     --token-auth-file "${DEMO_DIR}"/kcp-tokens
 

diff --git a/manifest/kcp.yaml b/manifest/kcp.yaml
@@ -111,7 +111,6 @@ spec:
         - /kcp
         args:
         - start
-        - --auto-publish-apis
         - --etcd-servers=https://etcd:2379
         - --etcd-keyfile=/etc/etcd/tls/server/tls.key
         - --etcd-certfile=/etc/etcd/tls/server/tls.crt

diff --git a/pkg/reconciler/apis/apiresource/startup.go b/pkg/reconciler/apis/apiresource/startup.go
@@ -25,7 +25,7 @@ import (
 // DefaultOptions are the default options for the apiresource controller.
 func DefaultOptions() *Options {
 	return &Options{
-		AutoPublishAPIs: false,
+		AutoPublishAPIs: true,
 		// Consumed by server instantiation
 		NumThreads: runtime.NumCPU(),
 	}

diff --git a/test/e2e/framework/fixture.go b/test/e2e/framework/fixture.go
@@ -64,7 +64,6 @@ func TestServerArgs() []string {
 // start a test server with the given token auth file.
 func TestServerArgsWithTokenAuthFile(tokenAuthFile string) []string {
 	return []string{
-		"--auto-publish-apis",
 		"--discovery-poll-interval=5s",
 		"--token-auth-file", tokenAuthFile,
 		"--run-virtual-workspaces=true",