Merge pull request #1329 from 24sama/master

fix: the generated kk config file contains the "containerManager" by default

README.md

@@ -123,22 +123,22 @@ Quick Start is for `all-in-one` installation which is a good start to get famili
 
 ##### Examples
 
-* Create a pure Kubernetes cluster with default version.
+* Create a pure Kubernetes cluster with default version (Kubernetes v1.23.7).
 
     ```shell script
     ./kk create cluster
     ```
 
-* Create a Kubernetes cluster with a specified version (e.g. `--with-kubernetes v1.24.1`).
+* Create a Kubernetes cluster with a specified version.
 
     ```shell script
-    ./kk create cluster --with-kubernetes [version]
+    ./kk create cluster --with-kubernetes v1.24.1 --container-manager containerd
     ```
 
-* Create a Kubernetes cluster with KubeSphere installed (e.g. `--with-kubesphere v3.2.1`).
+* Create a Kubernetes cluster with KubeSphere installed.
 
     ```shell script
-    ./kk create cluster --with-kubesphere [version]
+    ./kk create cluster --with-kubesphere v3.2.1
     ```
 
 #### Advanced

pkg/config/generate.go

@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	versionutil "k8s.io/apimachinery/pkg/util/version"
 
 	kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/apis/kubekey/v1alpha2"
 	"github.com/kubesphere/kubekey/pkg/common"
@@ -57,6 +58,15 @@ func GenerateKubeKeyConfig(arg common.Argument, name string) error {
 	} else {
 		opt.KubeVersion = arg.KubernetesVersion
 	}
+
+	if k8sVersion, err := versionutil.ParseGeneric(opt.KubeVersion); err == nil {
+		if k8sVersion.AtLeast(versionutil.MustParseSemantic("v1.24.0")) {
+			opt.ContainerManager = common.Conatinerd
+		} else {
+			opt.ContainerManager = common.Docker
+		}
+	}
+
 	opt.KubeSphereEnabled = arg.KsEnable
 
 	if arg.KsEnable {

pkg/config/templates/cluster.go

@@ -19,9 +19,9 @@ package templates
 import (
 	"text/template"
 
-	kubekeyapiv1alpha2 "github.com/kubesphere/kubekey/apis/kubekey/v1alpha2"
-	"github.com/kubesphere/kubekey/pkg/core/util"
 	"github.com/lithammer/dedent"
+
+	"github.com/kubesphere/kubekey/pkg/core/util"
 )
 
 // Cluster defines the template of cluster configuration file default.
@@ -54,6 +54,7 @@ spec:
     version: {{ .Options.KubeVersion }}
     clusterName: cluster.local
     autoRenewCerts: true
+    containerManager: {{ .Options.ContainerManager }}
   etcd:
     type: kubekey
   network:
@@ -81,12 +82,12 @@ type Options struct {
 	KubeVersion         string
 	KubeSphereEnabled   bool
 	KubeSphereConfigMap string
+	ContainerManager    string
 }
 
 // GenerateCluster is used to generate cluster configuration content.
 func GenerateCluster(opt *Options) (string, error) {
 	return util.Render(Cluster, util.Data{
-		"KubeVersion": kubekeyapiv1alpha2.DefaultKubeVersion,
-		"Options":     opt,
+		"Options": opt,
 	})
 }

pkg/kubernetes/tasks.go

@@ -513,7 +513,10 @@ func (f *FindNode) Execute(runtime connector.Runtime) error {
 	}
 
 	if node == "" {
-		return errors.New("Please check the node name in the config-sample.yaml or only support to delete a worker")
+		return errors.New("" +
+			"1. check the node name in the config-sample.yaml\n" +
+			"2. check the node name in the Kubernetes cluster\n" +
+			"3. only support to delete a worker\n")
 	}
 
 	f.PipelineCache.Set("dstNode", node)