Merge pull request #2119 from wenwutang1/master

add flag skip-dependency-check when upgrade cluster
kubesphere · Feb 13, 2024 · fb2a8ce · fb2a8ce
2 parents fa646fb + f47d36a
commit fb2a8ce
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 25 deletions.
diff --git a/cmd/kk/cmd/upgrade/upgrade.go b/cmd/kk/cmd/upgrade/upgrade.go
@@ -31,14 +31,15 @@ import (
 )
 
 type UpgradeOptions struct {
-	CommonOptions    *options.CommonOptions
-	ClusterCfgFile   string
-	Kubernetes       string
-	EnableKubeSphere bool
-	KubeSphere       string
-	SkipPullImages   bool
-	DownloadCmd      string
-	Artifact         string
+	CommonOptions       *options.CommonOptions
+	ClusterCfgFile      string
+	Kubernetes          string
+	EnableKubeSphere    bool
+	KubeSphere          string
+	SkipPullImages      bool
+	SkipDependencyCheck bool
+	DownloadCmd         string
+	Artifact            string
 }
 
 func NewUpgradeOptions() *UpgradeOptions {
@@ -80,14 +81,15 @@ func (o *UpgradeOptions) Complete(cmd *cobra.Command, args []string) error {
 
 func (o *UpgradeOptions) Run() error {
 	arg := common.Argument{
-		FilePath:          o.ClusterCfgFile,
-		KubernetesVersion: o.Kubernetes,
-		KsEnable:          o.EnableKubeSphere,
-		KsVersion:         o.KubeSphere,
-		SkipPullImages:    o.SkipPullImages,
-		Debug:             o.CommonOptions.Verbose,
-		SkipConfirmCheck:  o.CommonOptions.SkipConfirmCheck,
-		Artifact:          o.Artifact,
+		FilePath:            o.ClusterCfgFile,
+		KubernetesVersion:   o.Kubernetes,
+		KsEnable:            o.EnableKubeSphere,
+		KsVersion:           o.KubeSphere,
+		SkipPullImages:      o.SkipPullImages,
+		Debug:               o.CommonOptions.Verbose,
+		SkipConfirmCheck:    o.CommonOptions.SkipConfirmCheck,
+		Artifact:            o.Artifact,
+		SkipDependencyCheck: o.SkipDependencyCheck,
 	}
 	return pipelines.UpgradeCluster(arg, o.DownloadCmd)
 }
@@ -100,6 +102,7 @@ func (o *UpgradeOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&o.DownloadCmd, "download-cmd", "", "curl -L -o %s %s",
 		`The user defined command to download the necessary binary files. The first param '%s' is output path, the second param '%s', is the URL`)
 	cmd.Flags().StringVarP(&o.Artifact, "artifact", "a", "", "Path to a KubeKey artifact")
+	cmd.Flags().BoolVarP(&o.SkipDependencyCheck, "skip-dependency-check", "", false, "Skip kubernetes and kubesphere dependency version check")
 }
 
 func completionSetting(cmd *cobra.Command) (err error) {

diff --git a/cmd/kk/pkg/bootstrap/precheck/module.go b/cmd/kk/pkg/bootstrap/precheck/module.go
@@ -88,6 +88,7 @@ func (n *NodePreCheckModule) Init() {
 
 type ClusterPreCheckModule struct {
 	common.KubeModule
+	SkipDependencyCheck bool
 }
 
 func (c *ClusterPreCheckModule) Init() {
@@ -159,13 +160,25 @@ func (c *ClusterPreCheckModule) Init() {
 		Parallel: true,
 	}
 
-	c.Tasks = []task.Interface{
-		getKubeConfig,
-		getAllNodesK8sVersion,
-		calculateMinK8sVersion,
-		checkDesiredK8sVersion,
-		ksVersionCheck,
-		dependencyCheck,
-		getKubernetesNodesStatus,
+	if !c.SkipDependencyCheck {
+		c.Tasks = []task.Interface{
+			getKubeConfig,
+			getAllNodesK8sVersion,
+			calculateMinK8sVersion,
+			checkDesiredK8sVersion,
+			ksVersionCheck,
+			dependencyCheck,
+			getKubernetesNodesStatus,
+		}
+	} else {
+		c.Tasks = []task.Interface{
+			getKubeConfig,
+			getAllNodesK8sVersion,
+			calculateMinK8sVersion,
+			checkDesiredK8sVersion,
+			ksVersionCheck,
+			getKubernetesNodesStatus,
+		}
 	}
+
 }
diff --git a/cmd/kk/pkg/common/kube_runtime.go b/cmd/kk/pkg/common/kube_runtime.go
@@ -39,6 +39,7 @@ type Argument struct {
 	IgnoreErr           bool
 	SkipPullImages      bool
 	SkipPushImages      bool
+	SkipDependencyCheck bool
 	SecurityEnhancement bool
 	DeployLocalStorage  *bool
 	DownloadCommand     func(path, url string) string

diff --git a/cmd/kk/pkg/pipelines/upgrade_cluster.go b/cmd/kk/pkg/pipelines/upgrade_cluster.go
@@ -40,7 +40,7 @@ func NewUpgradeClusterPipeline(runtime *common.KubeRuntime) error {
 	m := []module.Module{
 		&precheck.GreetingsModule{},
 		&precheck.NodePreCheckModule{},
-		&precheck.ClusterPreCheckModule{},
+		&precheck.ClusterPreCheckModule{SkipDependencyCheck: runtime.Arg.SkipDependencyCheck},
 		&confirm.UpgradeConfirmModule{Skip: runtime.Arg.SkipConfirmCheck},
 		&artifact.UnArchiveModule{Skip: noArtifact},
 		&kubernetes.SetUpgradePlanModule{Step: kubernetes.ToV121},