Update disables list when building with no_stage

The --disable/--no-deploy flags actually turn off some built-in controllers, in addition to preventing manifests from getting loaded. Make it clear which controllers can still be disabled even when the packaged components are ommited by the no_stage build tag. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Update disables list when building with no_stage
3b8ec740 · Brad Davidson · Brad Davidson · ea916030 · 3b8ec740 · 3b8ec740
Commit 3b8ec740 authored Sep 28, 2020 by Brad Davidson Committed by Brad Davidson Nov 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 2 deletions

nostage.go pkg/cli/cmds/nostage.go +9 -0

server.go pkg/cli/cmds/server.go +0 -2

stage.go pkg/cli/cmds/stage.go +10 -0

No files found.
--- a/pkg/cli/cmds/nostage.go
+++ b/pkg/cli/cmds/nostage.go
+// +build no_stage
+
+package cmds
+
+const (
+	// The coredns and servicelb controllers can still be disabled, even if their manifests
+	// are missing. Same with CloudController/ccm.
+	DisableItems = "coredns, servicelb"
+)
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -8,8 +8,6 @@ import (
 )

 const (
-	DisableItems = "coredns, servicelb, traefik, local-storage, metrics-server"
-
 	defaultSnapshotRentention    = 5
 	defaultSnapshotIntervalHours = 12
 )

--- a/pkg/cli/cmds/stage.go
+++ b/pkg/cli/cmds/stage.go
+// +build !no_stage
+
+package cmds
+
+const (
+	// coredns and servicelb run controllers that are turned off when their manifests are disabled.
+	// The k3s CloudController also has a bundled manifest and can be disabled via the
+	// --disable-cloud-controller flag or --disable=ccm, but the latter method is not documented.
+	DisableItems = "coredns, servicelb, traefik, local-storage, metrics-server"
+)