From c318973cecf8fe002bc5f62f53deb6eb23054cd5 Mon Sep 17 00:00:00 2001 From: SataQiu <1527062125@qq.com> Date: Thu, 10 Sep 2020 14:05:36 +0800 Subject: [PATCH] fix the bug that kubeadm tries to call 'docker info' even if the CRI socket was for another CR --- cmd/kubeadm/app/util/config/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/util/config/cluster.go b/cmd/kubeadm/app/util/config/cluster.go index b3795681314..83188f6a151 100644 --- a/cmd/kubeadm/app/util/config/cluster.go +++ b/cmd/kubeadm/app/util/config/cluster.go @@ -125,7 +125,7 @@ func getInitConfigurationFromCluster(kubeconfigDir string, client clientset.Inte // However, if newControlPlane == true, initcfg.NodeRegistration is not used at all and it's overwritten later on. // Thus it's necessary to supply some default value, that will avoid the call to DetectCRISocket() and as // initcfg.NodeRegistration is discarded, setting whatever value here is harmless. - initcfg.NodeRegistration.CRISocket = constants.DefaultDockerCRISocket + initcfg.NodeRegistration.CRISocket = "/var/run/unknown.sock" } return initcfg, nil }