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

Don't enable kubelet until after kubeadm generates config #9111

Merged
merged 2 commits into from
Aug 28, 2020
Merged

Don't enable kubelet until after kubeadm generates config #9111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9aa9c0
Don't enable kubelet until after kubeadm generates /var/lib/kubelet/c…
Aug 28, 2020
52724f9
Run kubelet-start after kubeconfig as recommended in 1.19 changelog
Aug 28, 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
4 changes: 2 additions & 2 deletions pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,9 @@ func (k *Bootstrapper) restartControlPlane(cfg config.ClusterConfig) error {

baseCmd := fmt.Sprintf("%s %s", bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), phase)
cmds := []string{
fmt.Sprintf("%s phase kubelet-start --config %s", baseCmd, conf),
fmt.Sprintf("%s phase certs all --config %s", baseCmd, conf),
fmt.Sprintf("%s phase kubeconfig all --config %s", baseCmd, conf),
fmt.Sprintf("%s phase kubelet-start --config %s", baseCmd, conf),
tstromberg marked this conversation as resolved.
Show resolved Hide resolved
fmt.Sprintf("%s phase %s all --config %s", baseCmd, controlPlane, conf),
fmt.Sprintf("%s phase etcd local --config %s", baseCmd, conf),
}
Expand Down Expand Up @@ -831,7 +831,7 @@ func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cru
return errors.Wrap(err, "host alias")
}

return sm.Start("kubelet")
priyawadhwa marked this conversation as resolved.
Show resolved Hide resolved
return nil
}

// kubectlPath returns the path to the kubelet
Expand Down