mirror of https://github.com/k3s-io/k3s
8921f03347
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: Rostislav M. Georgiev <rostislavg@vmware.com> |
||
|---|---|---|
| .. | ||
| apiclient | ||
| audit | ||
| certs | ||
| config | ||
| crypto | ||
| dryrun | ||
| etcd | ||
| kubeconfig | ||
| pkiutil | ||
| pubkeypin | ||
| runtime | ||
| staticpod | ||
| system | ||
| BUILD | ||
| arguments.go | ||
| arguments_test.go | ||
| cgroupdriver.go | ||
| cgroupdriver_test.go | ||
| chroot_test.go | ||
| chroot_unix.go | ||
| chroot_windows.go | ||
| copy.go | ||
| endpoint.go | ||
| endpoint_test.go | ||
| error.go | ||
| error_test.go | ||
| marshal.go | ||
| marshal_test.go | ||
| template.go | ||
| template_test.go | ||
| version.go | ||
| version_test.go | ||