Skip to content

Commit 32a9758

Browse files
[Backport release-v1.4] fix: yurtadm join can't work when kubernetes version large than v1.27.0 (#1998)
* fix yurtadm join can't work when kubernetes version large than v1.27.0 (cherry picked from commit ed743d7)
1 parent cb2055b commit 32a9758

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

pkg/yurtadm/util/kubernetes/kubernetes.go

+13-5
Original file line numberDiff line numberDiff line change
@@ -396,17 +396,25 @@ func SetKubeadmJoinConfig(data joindata.YurtJoinData) error {
396396
"criSocket": nodeReg.CRISocket,
397397
"name": nodeReg.Name,
398398
}
399+
400+
v1, err := version.NewVersion(data.KubernetesVersion())
401+
if err != nil {
402+
return err
403+
}
404+
399405
if nodeReg.CRISocket == constants.DefaultDockerCRISocket {
400406
ctx["networkPlugin"] = "cni"
401407
} else {
402-
ctx["containerRuntime"] = "remote"
408+
v124alpha, err := version.NewVersion("1.24.0-alpha.0")
409+
if err != nil {
410+
return err
411+
}
412+
if v1.LessThan(v124alpha) {
413+
ctx["containerRuntime"] = "remote"
414+
}
403415
ctx["containerRuntimeEndpoint"] = nodeReg.CRISocket
404416
}
405417

406-
v1, err := version.NewVersion(data.KubernetesVersion())
407-
if err != nil {
408-
return err
409-
}
410418
v2, err := version.NewVersion("v1.22.0")
411419
if err != nil {
412420
return err

0 commit comments

Comments
 (0)