feat: delete --container-manager (#2577)

Signed-off-by: joyceliu <joyceliu@yunify.com>

cmd/kk/app/options/builtin/add.go

@@ -40,9 +40,8 @@ import (
 func NewAddNodeOptions() *AddNodeOptions {
 	// set default value
 	return &AddNodeOptions{
-		CommonOptions:    options.NewCommonOptions(),
-		Kubernetes:       defaultKubeVersion,
-		ContainerManager: defaultContainerManager,
+		CommonOptions: options.NewCommonOptions(),
+		Kubernetes:    defaultKubeVersion,
 	}
 }
 
@@ -51,8 +50,6 @@ type AddNodeOptions struct {
 	options.CommonOptions
 	// kubernetes version which the cluster will install.
 	Kubernetes string
-	// ContainerRuntime for kubernetes. Such as docker, containerd etc.
-	ContainerManager string
 	// ControlPlane nodes which will be added.
 	ControlPlane string
 	// Worker nodes which will to be added.
@@ -64,7 +61,6 @@ func (o *AddNodeOptions) Flags() cliflag.NamedFlagSets {
 	fss := o.CommonOptions.Flags()
 	kfs := fss.FlagSet("config")
 	kfs.StringVar(&o.Kubernetes, "with-kubernetes", o.Kubernetes, fmt.Sprintf("Specify a supported version of kubernetes. default is %s", o.Kubernetes))
-	kfs.StringVar(&o.ContainerManager, "container-manager", o.ContainerManager, fmt.Sprintf("Container runtime: docker, containerd. default is %s", o.ContainerManager))
 	kfs.StringVar(&o.ControlPlane, "control-plane", o.ControlPlane, "Which nodes will be installed as control-plane. Multiple nodes are supported, separated by commas (e.g., node1, node2, ...)")
 	kfs.StringVar(&o.Worker, "worker", o.Worker, "Which nodes will be installed as workers. Multiple nodes are supported, separated by commas (e.g., node1, node2, ...)")
 
@@ -110,13 +106,6 @@ func (o *AddNodeOptions) Complete(cmd *cobra.Command, args []string) (*kkcorev1.
 
 // complete updates the configuration with container manager and kubernetes version settings
 func (o *AddNodeOptions) complete() error {
-	if o.ContainerManager != "" {
-		// override container_manager in config
-		if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.ContainerManager, "cri", "container_manager"); err != nil {
-			return errors.Wrapf(err, "failed to set %q to config", "cri.container_manager")
-		}
-	}
-
 	if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
 		return errors.Wrapf(err, "failed to set %q to config", "kube_version")
 	}

cmd/kk/app/options/builtin/builtin.go

@@ -30,6 +30,10 @@ import (
 	"github.com/kubesphere/kubekey/v4/builtin/core"
 )
 
+const (
+	defaultKubeVersion = "v1.23.15"
+)
+
 const (
 	defaultGroupControlPlane = "kube_control_plane"
 	defaultGroupWorker       = "kube_worker"

cmd/kk/app/options/builtin/create.go

@@ -35,11 +35,6 @@ import (
 	"github.com/kubesphere/kubekey/v4/cmd/kk/app/options"
 )
 
-const (
-	defaultKubeVersion      = "v1.23.15"
-	defaultContainerManager = "docker"
-)
-
 // ======================================================================================
 //                                  create cluster
 // ======================================================================================
@@ -48,9 +43,8 @@ const (
 func NewCreateClusterOptions() *CreateClusterOptions {
 	// set default value
 	return &CreateClusterOptions{
-		CommonOptions:    options.NewCommonOptions(),
-		Kubernetes:       defaultKubeVersion,
-		ContainerManager: defaultContainerManager,
+		CommonOptions: options.NewCommonOptions(),
+		Kubernetes:    defaultKubeVersion,
 	}
 }
 
@@ -59,8 +53,6 @@ type CreateClusterOptions struct {
 	options.CommonOptions
 	// kubernetes version which the cluster will install.
 	Kubernetes string
-	// ContainerRuntime for kubernetes. Such as docker, containerd etc.
-	ContainerManager string
 }
 
 // Flags add to newCreateClusterCommand
@@ -68,7 +60,6 @@ func (o *CreateClusterOptions) Flags() cliflag.NamedFlagSets {
 	fss := o.CommonOptions.Flags()
 	kfs := fss.FlagSet("config")
 	kfs.StringVar(&o.Kubernetes, "with-kubernetes", o.Kubernetes, fmt.Sprintf("Specify a supported version of kubernetes. default is %s", o.Kubernetes))
-	kfs.StringVar(&o.ContainerManager, "container-manager", o.ContainerManager, fmt.Sprintf("Container runtime: docker, containerd. default is %s", o.ContainerManager))
 
 	return fss
 }
@@ -110,12 +101,6 @@ func (o *CreateClusterOptions) Complete(cmd *cobra.Command, args []string) (*kkc
 }
 
 func (o *CreateClusterOptions) completeConfig() error {
-	if o.ContainerManager != "" {
-		// override container_manager in config
-		if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.ContainerManager, "cri", "container_manager"); err != nil {
-			return errors.Wrapf(err, "failed to set %q to config", "cri.container_manager")
-		}
-	}
 
 	if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
 		return errors.Wrapf(err, "failed to set %q to config", "kube_version")

cmd/kk/app/options/builtin/delete.go

@@ -40,9 +40,8 @@ import (
 func NewDeleteClusterOptions() *DeleteClusterOptions {
 	// set default value
 	return &DeleteClusterOptions{
-		CommonOptions:    options.NewCommonOptions(),
-		Kubernetes:       defaultKubeVersion,
-		ContainerManager: defaultContainerManager,
+		CommonOptions: options.NewCommonOptions(),
+		Kubernetes:    defaultKubeVersion,
 	}
 }
 
@@ -51,8 +50,6 @@ type DeleteClusterOptions struct {
 	options.CommonOptions
 	// kubernetes version which the cluster will install.
 	Kubernetes string
-	// ContainerRuntime for kubernetes. Such as docker, containerd etc.
-	ContainerManager string
 }
 
 // Flags returns the flag sets for DeleteClusterOptions
@@ -60,7 +57,6 @@ func (o *DeleteClusterOptions) Flags() cliflag.NamedFlagSets {
 	fss := o.CommonOptions.Flags()
 	kfs := fss.FlagSet("config")
 	kfs.StringVar(&o.Kubernetes, "with-kubernetes", o.Kubernetes, fmt.Sprintf("Specify a supported version of kubernetes. default is %s", o.Kubernetes))
-	kfs.StringVar(&o.ContainerManager, "container-manager", o.ContainerManager, fmt.Sprintf("Container runtime: docker, containerd. default is %s", o.ContainerManager))
 
 	return fss
 }
@@ -108,13 +104,6 @@ func (o *DeleteClusterOptions) Complete(cmd *cobra.Command, args []string) (*kkc
 
 // completeConfig updates the configuration with container manager settings
 func (o *DeleteClusterOptions) completeConfig() error {
-	if o.ContainerManager != "" {
-		// override container_manager in config
-		if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.ContainerManager, "cri", "container_manager"); err != nil {
-			return errors.Wrapf(err, "failed to set %q to config", "cri.container_manager")
-		}
-	}
-
 	if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
 		return errors.Wrapf(err, "failed to set %q to config", "kube_version")
 	}
@@ -130,9 +119,8 @@ func (o *DeleteClusterOptions) completeConfig() error {
 func NewDeleteNodesOptions() *DeleteNodesOptions {
 	// set default value
 	return &DeleteNodesOptions{
-		CommonOptions:    options.NewCommonOptions(),
-		Kubernetes:       defaultKubeVersion,
-		ContainerManager: defaultContainerManager,
+		CommonOptions: options.NewCommonOptions(),
+		Kubernetes:    defaultKubeVersion,
 	}
 }
 
@@ -141,8 +129,6 @@ type DeleteNodesOptions struct {
 	options.CommonOptions
 	// kubernetes version which the cluster will install.
 	Kubernetes string
-	// ContainerRuntime for kubernetes. Such as docker, containerd etc.
-	ContainerManager string
 }
 
 // Flags returns the flag sets for DeleteNodesOptions
@@ -150,7 +136,6 @@ func (o *DeleteNodesOptions) Flags() cliflag.NamedFlagSets {
 	fss := o.CommonOptions.Flags()
 	kfs := fss.FlagSet("config")
 	kfs.StringVar(&o.Kubernetes, "with-kubernetes", o.Kubernetes, fmt.Sprintf("Specify a supported version of kubernetes. default is %s", o.Kubernetes))
-	kfs.StringVar(&o.ContainerManager, "container-manager", o.ContainerManager, fmt.Sprintf("Container runtime: docker, containerd. default is %s", o.ContainerManager))
 
 	return fss
 }
@@ -199,13 +184,6 @@ func (o *DeleteNodesOptions) Complete(cmd *cobra.Command, args []string) (*kkcor
 
 // completeConfig updates the configuration with container manager settings
 func (o *DeleteNodesOptions) completeConfig(nodes []string) error {
-	if o.ContainerManager != "" {
-		// override container_manager in config
-		if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.ContainerManager, "cri", "container_manager"); err != nil {
-			return errors.Wrapf(err, "failed to set %q to config", "cri.container_manager")
-		}
-	}
-
 	if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
 		return errors.Wrapf(err, "failed to set %q to config", "kube_version")
 	}