Merge pull request kubernetes#94555 from SataQiu/fix-crisocket-warning-20200905

k8s-ci-robot · web-flow · commit 5dd2676bf68e · 2020-09-14T09:41:12.000-07:00
Fix the bug that kubeadm tries to call 'docker info' even if the CRI socket was for another CR
diff --git 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
 }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func getInitConfigurationFromCluster(kubeconfigDir string, client clientset.Inte`
`125`	`125`	`// However, if newControlPlane == true, initcfg.NodeRegistration is not used at all and it's overwritten later on.`
`126`	`126`	`// Thus it's necessary to supply some default value, that will avoid the call to DetectCRISocket() and as`
`127`	`127`	`// initcfg.NodeRegistration is discarded, setting whatever value here is harmless.`
`128`		`- initcfg.NodeRegistration.CRISocket = constants.DefaultDockerCRISocket`
	`128`	`+ initcfg.NodeRegistration.CRISocket = "/var/run/unknown.sock"`
`129`	`129`	`}`
`130`	`130`	`return initcfg, nil`
`131`	`131`	`}`