Skip to content

Commit e28c7b1

Browse files
committed
skip cri detection for kubeadm token create
1 parent 5f91b68 commit e28c7b1

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

cmd/kubeadm/app/cmd/token.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/options"
4343
phaseutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases"
4444
cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
45+
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
4546
tokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/node"
4647
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
4748
"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
@@ -215,6 +216,12 @@ func RunCreateToken(out io.Writer, client clientset.Interface, cfgPath string, c
215216

216217
// This call returns the ready-to-use configuration based on the configuration file that might or might not exist and the default cfg populated by flags
217218
klog.V(1).Infoln("[token] loading configurations")
219+
220+
// In fact, we don't do any CRI ops at all.
221+
// This is just to force skipping the CRI detection.
222+
// Ref: https://github.com/kubernetes/kubeadm/issues/1559
223+
cfg.NodeRegistration.CRISocket = kubeadmconstants.DefaultDockerCRISocket
224+
218225
internalcfg, err := configutil.LoadOrDefaultInitConfiguration(cfgPath, cfg)
219226
if err != nil {
220227
return err

0 commit comments

Comments
 (0)