Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wait to add aliases to /etc/hosts before starting kubelet #8035

Merged
merged 19 commits into from
May 8, 2020
Merged

Wait to add aliases to /etc/hosts before starting kubelet #8035

Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c037a97
Restart kubeadm on soft `minikube start`
May 7, 2020
a353d56
Add comments
May 7, 2020
163ab88
Restart kubelet in a function that is called on soft start
May 7, 2020
8ac4281
Restart kubelet if soft start
May 7, 2020
69a39c1
Add kic
May 7, 2020
ced1914
remove unnecessary code
May 7, 2020
8096094
move into separate function
May 7, 2020
fce7562
Add start/stop test for plain old docker
May 7, 2020
9348667
Add host alias back after restarting kubelet
May 8, 2020
73d15fc
Start kubelet after host aliases have been set in /etc/hosts
May 8, 2020
826fb2b
Restart kubelet after updating config files
May 8, 2020
0fa2499
Remove Enable(kubelet) from unpause
May 8, 2020
f574852
make it impossible to enable the kubelet service
May 8, 2020
ba26770
Merge branch 'master' of https://github.com/kubernetes/minikube into …
May 8, 2020
cb4dc30
Add unit test
May 8, 2020
6d1d07c
Remove unnecessary restart
May 8, 2020
753dc44
Remove unnecessary function
May 8, 2020
bfef99b
Copy files directly now that we control kubeadm
May 8, 2020
2915aaf
Remove test
May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/drivers/kic/kic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,14 @@ func (d *Driver) Restart() error {
if err = d.Start(); err != nil {
return fmt.Errorf("start during restart %v", err)
}
// 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...")
cr := command.NewExecRunner() // using exec runner for interacting with docker/podman daemon
if _, err := cr.RunCmd(exec.Command("sudo", "systemctl", "restart", "kubelet")); err != nil {
priyawadhwa marked this conversation as resolved.
Show resolved Hide resolved
return errors.Wrap(err, "restarting kubelet")
}
return nil

}
Expand Down