fix: upgrade 0.6 to 0.8 failed (#219)

apecloud · Jan 10, 2024 · f26f982 · f26f982
1 parent 3af2ed1
commit f26f982
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkg/cmd/kubeblocks/upgrade.go b/pkg/cmd/kubeblocks/upgrade.go
@@ -195,6 +195,16 @@ func (o *InstallOptions) Upgrade() error {
 		msg = "to " + o.Version
 	}
 
+	// save resources of old version before upgrade the crds
+	upgrader := breakingchange.Upgrader{
+		FromVersion: o.OldVersion,
+		ToVersion:   o.Version,
+		Dynamic:     o.Dynamic,
+	}
+	if err = upgrader.SaveOldResources(); err != nil {
+		return err
+	}
+
 	// create or update crds
 	s = spinner.New(o.Out, spinnerMsg("Upgrade CRDs"))
 	defer s.Fail()

diff --git a/pkg/util/helm/helm.go b/pkg/util/helm/helm.go
@@ -557,11 +557,6 @@ func (i *InstallOpts) tryUpgrade(cfg *action.Configuration) (*release.Release, e
 		cancel()
 	}()
 
-	// save resources of old version
-	if err = i.Upgrader.SaveOldResources(); err != nil {
-		return nil, err
-	}
-
 	// update crds before helm upgrade
 	for _, obj := range chartRequested.CRDObjects() {
 		// Read in the resources