update mca progressing condition when desired and last applied matches (

#513)

Signed-off-by: haoqing0110 <[email protected]>

pkg/addon/controllers/addonprogressing/controller.go

@@ -283,20 +283,12 @@ func workIsReady(work *workapiv1.ManifestWork) bool {
 	return true
 }
 
-// set addon progressing condition and last applied
+// Set addon progressing condition and last applied
+// Once completed, the LastAppliedConfig will set to DesiredConfig. Even the condition status
+// changes later, eg, spoke cluster becomes unhealthy, status becomes progressing or failed after completed,
+// the LastAppliedConfig and DesiredConfig won't change. this is to avoid back and forth in rollout.
+// The setRolloutStatus() func in graph.go only look at the LastAppliedConfig and DesiredConfig.
 func setAddOnProgressingAndLastApplied(reason string, message string, addon *addonapiv1alpha1.ManagedClusterAddOn) {
-	// always update progressing condition when there is no config
-	// skip update progressing condition when last applied config already the same as desired
-	skip := len(addon.Status.ConfigReferences) > 0
-	for _, configReference := range addon.Status.ConfigReferences {
-		if !equality.Semantic.DeepEqual(configReference.LastAppliedConfig, configReference.DesiredConfig) {
-			skip = false
-		}
-	}
-	if skip {
-		return
-	}
-
 	condition := metav1.Condition{
 		Type:   addonapiv1alpha1.ManagedClusterAddOnConditionProgressing,
 		Reason: reason,

test/integration/addon/addon_manager_upgrade_test.go

@@ -356,7 +356,7 @@ var _ = ginkgo.Describe("Addon upgrade", func() {
 			})
 
 			ginkgo.By("update work status to avoid addon status update")
-			for i := 0; i < 4; i++ {
+			for i := 0; i < 2; i++ {
 				updateManifestWorkStatus(hubWorkClient, clusterNames[i], manifestWorkName, metav1.ConditionFalse)
 			}
 
@@ -503,6 +503,9 @@ var _ = ginkgo.Describe("Addon upgrade", func() {
 			for i := 0; i < 2; i++ {
 				updateManifestWorkStatus(hubWorkClient, clusterNames[i], manifestWorkName, metav1.ConditionTrue)
 			}
+			for i := 3; i < 4; i++ {
+				updateManifestWorkStatus(hubWorkClient, clusterNames[i], manifestWorkName, metav1.ConditionFalse)
+			}
 
 			ginkgo.By("check mca status")
 			for i := 0; i < 2; i++ {
@@ -627,7 +630,7 @@ var _ = ginkgo.Describe("Addon upgrade", func() {
 			})
 
 			ginkgo.By("update work status to avoid addon status update")
-			for i := 0; i < 4; i++ {
+			for i := 0; i < 2; i++ {
 				updateManifestWorkStatus(hubWorkClient, clusterNames[i], manifestWorkName, metav1.ConditionFalse)
 			}
 
@@ -762,6 +765,9 @@ var _ = ginkgo.Describe("Addon upgrade", func() {
 			for i := 0; i < 2; i++ {
 				updateManifestWorkStatus(hubWorkClient, clusterNames[i], manifestWorkName, metav1.ConditionTrue)
 			}
+			for i := 2; i < 4; i++ {
+				updateManifestWorkStatus(hubWorkClient, clusterNames[i], manifestWorkName, metav1.ConditionFalse)
+			}
 			assertClusterManagementAddOnNoConditions(testAddOnConfigsImpl.name, start, 3*time.Second, metav1.Condition{
 				Type:    addonapiv1alpha1.ManagedClusterAddOnConditionProgressing,
 				Status:  metav1.ConditionTrue,