kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle default cri socket path in docker 

Use /var/run/dockershim.sock for default
pull/7780/head
Anders F Björklund 2020-04-19 16:07:09 +02:00
parent 5f86da5b54
commit e726215974
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View File

@ -621,6 +621,9 @@ func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {
ka := bsutil.InvokeKubeadm(k8s.KubernetesVersion) ka := bsutil.InvokeKubeadm(k8s.KubernetesVersion)
sp := cr.SocketPath() sp := cr.SocketPath()
if sp == "" {
sp = kconst.DefaultDockerCRISocket
}
cmd := fmt.Sprintf("%s reset --cri-socket %s --force", ka, sp) cmd := fmt.Sprintf("%s reset --cri-socket %s --force", ka, sp)
if version.LT(semver.MustParse("1.11.0")) { if version.LT(semver.MustParse("1.11.0")) {
cmd = fmt.Sprintf("%s reset --cri-socket %s", ka, sp) cmd = fmt.Sprintf("%s reset --cri-socket %s", ka, sp)