fix: no need to update revision of configSpecs that have not changed

apecloud · Oct 20, 2023 · 3a7c6c0 · 3a7c6c0
1 parent 88677d9
commit 3a7c6c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/controllers/apps/configuration/configuration_controller.go b/controllers/apps/configuration/configuration_controller.go
@@ -160,7 +160,6 @@ func (r *ConfigurationReconciler) runTasks(taskCtx TaskContext, tasks []Task) (e
 	patch := client.MergeFrom(configuration.DeepCopy())
 	revision := strconv.FormatInt(configuration.GetGeneration(), 10)
 	for _, task := range tasks {
-		task.Status.UpdateRevision = revision
 		if err := task.Do(taskCtx.fetcher, synthesizedComp, revision); err != nil {
 			errs = append(errs, err)
 			continue

diff --git a/controllers/apps/configuration/reconcile_task.go b/controllers/apps/configuration/reconcile_task.go
@@ -95,6 +95,8 @@ func syncImpl(fetcher *Task,
 		UpdateConfigVersion(revision).
 		Sync().
 		Complete()
+
+	status.UpdateRevision = revision
 	if err != nil {
 		status.Message = cfgutil.ToPointer(err.Error())
 		status.Phase = appsv1alpha1.CMergeFailedPhase