Merge pull request #850 from chaunceyjiang/fix_793

Support [--yes] parameter when upgrade cluster
kubesphere · Dec 9, 2021 · 16712b0 · 16712b0
2 parents b5a41a0 + 60025e1
commit 16712b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmd/ctl/upgrade/upgrade.go b/cmd/ctl/upgrade/upgrade.go
@@ -83,6 +83,7 @@ func (o *UpgradeOptions) Run() error {
 		KsVersion:         o.KubeSphere,
 		SkipPullImages:    o.SkipPullImages,
 		Debug:             o.CommonOptions.Verbose,
+		SkipConfirmCheck:  o.CommonOptions.SkipConfirmCheck,
 	}
 	return pipelines.UpgradeCluster(arg, o.DownloadCmd)
 }

diff --git a/pkg/pipelines/upgrade_cluster.go b/pkg/pipelines/upgrade_cluster.go
@@ -34,7 +34,7 @@ func NewUpgradeClusterPipeline(runtime *common.KubeRuntime) error {
 	m := []module.Module{
 		&precheck.NodePreCheckModule{},
 		&precheck.ClusterPreCheckModule{},
-		&confirm.UpgradeConfirmModule{},
+		&confirm.UpgradeConfirmModule{Skip: runtime.Arg.SkipConfirmCheck},
 		&os.ConfigureOSModule{},
 		&kubernetes.SetUpgradePlanModule{Step: kubernetes.ToV121},
 		&kubernetes.ProgressiveUpgradeModule{Step: kubernetes.ToV121},