diff --git a/pkg/yurtadm/util/kubernetes/kubernetes.go b/pkg/yurtadm/util/kubernetes/kubernetes.go index 472c89b33d6..c227e5e77f7 100644 --- a/pkg/yurtadm/util/kubernetes/kubernetes.go +++ b/pkg/yurtadm/util/kubernetes/kubernetes.go @@ -396,17 +396,25 @@ func SetKubeadmJoinConfig(data joindata.YurtJoinData) error { "criSocket": nodeReg.CRISocket, "name": nodeReg.Name, } + + v1, err := version.NewVersion(data.KubernetesVersion()) + if err != nil { + return err + } + if nodeReg.CRISocket == constants.DefaultDockerCRISocket { ctx["networkPlugin"] = "cni" } else { - ctx["containerRuntime"] = "remote" + v124alpha, err := version.NewVersion("1.24.0-alpha.0") + if err != nil { + return err + } + if v1.LessThan(v124alpha) { + ctx["containerRuntime"] = "remote" + } ctx["containerRuntimeEndpoint"] = nodeReg.CRISocket } - v1, err := version.NewVersion(data.KubernetesVersion()) - if err != nil { - return err - } v2, err := version.NewVersion("v1.22.0") if err != nil { return err