From 341895c3225784d49aed1d2d2e07b39bc7674bb2 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 28 Apr 2020 23:08:22 -0700 Subject: [PATCH] Don't write ccm.yaml if --disable-cloud-controller is set --- pkg/cli/server/server.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go index 2319e518c4..8fe51e42a1 100644 --- a/pkg/cli/server/server.go +++ b/pkg/cli/server/server.go @@ -171,6 +171,11 @@ func run(app *cli.Context, cfg *cmds.Server) error { serverConfig.DisableServiceLB = true } + if serverConfig.ControlConfig.DisableCCM { + serverConfig.ControlConfig.Skips["ccm"] = true + serverConfig.ControlConfig.Disables["ccm"] = true + } + logrus.Info("Starting k3s ", app.App.Version) notifySocket := os.Getenv("NOTIFY_SOCKET") os.Unsetenv("NOTIFY_SOCKET")