Skip to content

Commit f2afe09

Browse files
committed
add pr 11180
1 parent 05abcd5 commit f2afe09

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,15 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
758758
return errors.Wrapf(err, "kubeadm join")
759759
}
760760

761+
// avoid "Found multiple CRI sockets, please use --cri-socket to select one: /var/run/dockershim.sock, /var/run/crio/crio.sock" error
762+
cr, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime, Runner: k.c, Socket: cc.KubernetesConfig.CRISocket})
763+
if err != nil {
764+
return errors.Wrap(err, "runtime")
765+
}
766+
if sp := cr.SocketPath(); sp != "" {
767+
joinCmd = fmt.Sprintf("%s --cri-socket=%s", joinCmd, sp)
768+
}
769+
761770
if _, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", "sudo systemctl daemon-reload && sudo systemctl enable kubelet && sudo systemctl start kubelet")); err != nil {
762771
return errors.Wrap(err, "starting kubelet")
763772
}

0 commit comments

Comments
 (0)