move into separate function

pull/8035/head
Priya Wadhwa 2020-05-07 13:45:34 -07:00
parent ced1914fed
commit 80960945af
1 changed files with 19 additions and 8 deletions

View File

@ -181,14 +181,8 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
}
}
if starter.PreExists && driver.IsKIC(starter.Host.DriverName) {
// we need to restart kubelet to ensure that it picks up the correct node ip
// there seems to be a race condition between when the ip is updated
// on node restarts and kubelet starting up
glog.Infof("Restarting kubelet...")
if err := sysinit.New(starter.Runner).Restart("kubelet"); err != nil {
return nil, errors.Wrap(err, "restarting kubelet")
}
if err := restartKubeletIfNeeded(starter); err != nil {
return nil, errors.Wrap(err, "restarting kubelet")
}
wg.Wait()
@ -197,6 +191,23 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
return kcs, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
}
func restartKubeletIfNeeded(starter Starter) error {
if !starter.PreExists {
return nil
}
if !driver.IsKIC(starter.Host.DriverName) {
return nil
}
// on soft start and kic, we need to restart kubelet to ensure that it picks up the correct node ip
// there seems to be a race condition between when the ip is updated
// on node restarts and kubelet starting up
glog.Infof("Restarting kubelet...")
if err := sysinit.New(starter.Runner).Restart("kubelet"); err != nil {
return errors.Wrap(err, "restarting kubelet")
}
return nil
}
// Provision provisions the machine/container for the node
func Provision(cc *config.ClusterConfig, n *config.Node, apiServer bool) (command.Runner, bool, libmachine.API, *host.Host, error) {