github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1752 from ibuildthecloud/disable-ccm 

Don't write ccm.yaml if --disable-cloud-controller is set
pull/1756/head
Darren Shepherd 2020-05-05 15:11:10 -07:00 committed by GitHub
parent 70ddc799bd 341895c322
commit 1d05e99769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cli/server/server.go
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")