feat: check if target version existed before upgrade

apecloud · Nov 21, 2023 · 6e08a9f · 6e08a9f
1 parent 756333e
commit 6e08a9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/cmd/kubeblocks/install.go b/pkg/cmd/kubeblocks/install.go
@@ -403,9 +403,9 @@ func (o *InstallOptions) checkVersion(v util.Version) error {
 	// check installing version exists
 	if exists, err := versionExists(o.Version); !exists {
 		if err != nil {
-			klog.V(1).Infof(err.Error())
+			return err
 		}
-		return errors.Wrapf(err, "version %s does not exist, please use \"kbcli kubeblocks list-versions --devel\" to show the available versions", o.Version)
+		return fmt.Errorf("version %s does not exist, please use \"kbcli kubeblocks list-versions --devel\" to show the available versions", o.Version)
 	}
 
 	versionErr := fmt.Errorf("failed to get kubernetes version")

diff --git a/pkg/cmd/kubeblocks/upgrade.go b/pkg/cmd/kubeblocks/upgrade.go
@@ -122,6 +122,14 @@ func (o *InstallOptions) Upgrade() error {
 	}
 	fmt.Fprintf(o.Out, "Current KubeBlocks version %s.\n", v.KubeBlocks)
 
+	// check installing version exists
+	if exists, err := versionExists(o.Version); !exists {
+		if err != nil {
+			return err
+		}
+		return fmt.Errorf("version %s does not exist, please use \"kbcli kubeblocks list-versions --devel\" to show the available versions", o.Version)
+	}
+
 	if err = o.checkVersion(v); err != nil {
 		return err
 	}