github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix the bug that kubeadm tries to call 'docker info' even if the CRI socket was for another CR
This commit is contained in:
Kubernetes Prow Robot 2020-09-14 09:41:12 -07:00 committed by GitHub
commit 5dd2676bf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/config/cluster.go
View File

@ -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
}