github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76505 from rosti/fix-join-cri-detection 

kubeadm: Don't error out on join with --cri-socket override
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-14 14:30:00 -07:00 committed by GitHub
parent 8c4651cc41 2d4307db9f
commit 299aa5d7a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,15 @@ func getInitConfigurationFromCluster(kubeconfigDir string, client clientset.Inte
if err := getAPIEndpoint(configMap.Data, initcfg.NodeRegistration.Name, &initcfg.LocalAPIEndpoint); err != nil {
return nil, errors.Wrap(err, "failed to getAPIEndpoint")
}
} else {
// In the case where newControlPlane is true we don't go through getNodeRegistration() and initcfg.NodeRegistration.CRISocket is empty.
// This forces DetectCRISocket() to be called later on, and if there is more than one CRI installed on the system, it will error out,
// while asking for the user to provide an override for the CRI socket. Even if the user provides an override, the call to
// DetectCRISocket() can happen too early and thus ignore it (while still erroring out).
// 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
}
return initcfg, nil
}