fix(application): sync chart version in rollback

tkestack · May 6, 2022 · 13a8c38 · 13a8c38
1 parent 4c13117
commit 13a8c38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/pkg/application/controller/app/action/rollback.go b/pkg/application/controller/app/action/rollback.go
@@ -67,6 +67,7 @@ func Rollback(ctx context.Context,
 			newStatus.Message = ""
 			newStatus.Reason = ""
 			newStatus.LastTransitionTime = metav1.Now()
+			newStatus.ObservedGeneration -= 1
 			newStatus.RollbackRevision = 0 // clean revision
 		}
 		app, updateStatusErr = updateStatusFunc(ctx, app, &app.Status, newStatus)

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
 	}