public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-07 02:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup bootstrap

Browse Source
This commit is contained in:
Erik Wilson
2019-06-30 12:39:54 -07:00
parent 8d979d675e
commit 24b73403c7
5 changed files with 112 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cli/server/server.go
View File

@@ -124,7 +124,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
serverConfig.ControlConfig.StorageKeyFile = cfg.StorageKeyFile
serverConfig.ControlConfig.AdvertiseIP = cfg.AdvertiseIP
serverConfig.ControlConfig.AdvertisePort = cfg.AdvertisePort
serverConfig.ControlConfig.CertStorageBackend = cfg.CertStorageBackend
serverConfig.ControlConfig.BootstrapType = cfg.BootstrapType
if serverConfig.ControlConfig.AdvertiseIP == "" && cmds.AgentConfig.NodeIP != "" {
serverConfig.ControlConfig.AdvertiseIP = cmds.AgentConfig.NodeIP