• Rostislav M. Georgiev's avatar
    kubeadm: Don't error out on join with --cri-socket override · 8921f033
    Rostislav M. Georgiev authored
    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.
    Signed-off-by: 's avatarRostislav M. Georgiev <rostislavg@vmware.com>
    8921f033
Name
Last commit
Last update
..
apiclient Loading commit data...
audit Loading commit data...
certs Loading commit data...
config Loading commit data...
crypto Loading commit data...
dryrun Loading commit data...
etcd Loading commit data...
kubeconfig Loading commit data...
pkiutil Loading commit data...
pubkeypin Loading commit data...
runtime Loading commit data...
staticpod Loading commit data...
system Loading commit data...
BUILD Loading commit data...
arguments.go Loading commit data...
arguments_test.go Loading commit data...
cgroupdriver.go Loading commit data...
cgroupdriver_test.go Loading commit data...
chroot_test.go Loading commit data...
chroot_unix.go Loading commit data...
chroot_windows.go Loading commit data...
copy.go Loading commit data...
endpoint.go Loading commit data...
endpoint_test.go Loading commit data...
error.go Loading commit data...
error_test.go Loading commit data...
marshal.go Loading commit data...
marshal_test.go Loading commit data...
template.go Loading commit data...
template_test.go Loading commit data...
version.go Loading commit data...
version_test.go Loading commit data...