fix(application): sync chart version in rollback (#1908)

tkestack · May 7, 2022 · 854587c · 854587c
1 parent a65952d
commit 854587c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/application/controller/app/app_controller.go b/pkg/application/controller/app/app_controller.go
@@ -395,6 +395,11 @@ func (c *Controller) syncAppFromRelease(ctx context.Context, cachedApp *cachedAp
 		newStatus.LastTransitionTime = metav1.Now()
 		return c.updateStatus(ctx, app, &app.Status, newStatus)
 	}
+	app.Spec.Chart.ChartVersion = rel.Chart.Metadata.Version
+	_, err = c.client.ApplicationV1().Apps(app.Namespace).Update(ctx, app, metav1.UpdateOptions{})
+	if err != nil {
+		return app, fmt.Errorf("update chart version failed %v", err)
+	}
 
 	newStatus.Phase = applicationv1.AppPhaseSucceeded
 	newStatus.Message = ""

diff --git a/pkg/application/registry/application/storage/rest.go b/pkg/application/registry/application/storage/rest.go
@@ -233,7 +233,7 @@ func (rs *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObj
 		}
 	}
 
-	if !reflect.DeepEqual(oldApp.Spec, app.Spec) {
+	if !reflect.DeepEqual(oldApp.Spec, app.Spec) && app.Status.Phase != applicationapi.AppPhaseRolledBack {
 		app.Status.Phase = applicationapi.AppPhaseUpgrading
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	if !reflect.DeepEqual(oldApp.Spec, app.Spec) {
+    	if !reflect.DeepEqual(oldApp.Spec, app.Spec) && app.Status.Phase != applicationapi.AppPhaseRolledBack {
     		app.Status.Phase = applicationapi.AppPhaseUpgrading
     	}
@@ Expand Down @@