Merge pull request #1752 from ibuildthecloud/disable-ccm

Don't write ccm.yaml if --disable-cloud-controller is set
This commit is contained in:
Darren Shepherd 2020-05-05 15:11:10 -07:00 committed by GitHub
commit 1d05e99769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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")