File tree 1 file changed +13
-5
lines changed
pkg/yurtadm/util/kubernetes
1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -396,17 +396,25 @@ func SetKubeadmJoinConfig(data joindata.YurtJoinData) error {
396
396
"criSocket" : nodeReg .CRISocket ,
397
397
"name" : nodeReg .Name ,
398
398
}
399
+
400
+ v1 , err := version .NewVersion (data .KubernetesVersion ())
401
+ if err != nil {
402
+ return err
403
+ }
404
+
399
405
if nodeReg .CRISocket == constants .DefaultDockerCRISocket {
400
406
ctx ["networkPlugin" ] = "cni"
401
407
} 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
+ }
403
415
ctx ["containerRuntimeEndpoint" ] = nodeReg .CRISocket
404
416
}
405
417
406
- v1 , err := version .NewVersion (data .KubernetesVersion ())
407
- if err != nil {
408
- return err
409
- }
410
418
v2 , err := version .NewVersion ("v1.22.0" )
411
419
if err != nil {
412
420
return err
You can’t perform that action at this time.
0 commit comments