From b9aa9c0f0fe1161cf3c79fdf195683cb2c53cfa8 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 28 Aug 2020 12:19:36 -0400 Subject: [PATCH 1/2] Don't enable kubelet until after kubeadm generates /var/lib/kubelet/config.yaml --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 9f20e612851f..8e0a30c80cd8 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -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") + return nil } // kubectlPath returns the path to the kubelet From 52724f956bb3a3c96a104a6508439e7c2d83a420 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 28 Aug 2020 12:23:25 -0400 Subject: [PATCH 2/2] Run kubelet-start after kubeconfig as recommended in 1.19 changelog --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 8e0a30c80cd8..fcaaa1a6be3c 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -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), fmt.Sprintf("%s phase %s all --config %s", baseCmd, controlPlane, conf), fmt.Sprintf("%s phase etcd local --config %s", baseCmd, conf), }