Merge pull request #728 from openshift-cherrypick-robot/cherry-pick-725-to-release-4.12

openshift-merge-robot · web-flow · commit ce19dbb7c6f7 · 2023-02-06T11:12:30.000-05:00
[release-4.12] OCPBUGS-6921: Recover ConsoleNotificationSync after being degraded
diff --git a/pkg/console/controllers/upgradenotification/controller.go b/pkg/console/controllers/upgradenotification/controller.go
@@ -94,8 +94,8 @@ func (c *UpgradeNotificationController) Sync(ctx context.Context, controllerCont
 	reason, err := c.syncClusterUpgradeNotification(ctx)
 	if err != nil {
 		klog.V(4).Infof("error syncing %s consolenotification custom resource: %s", api.UpgradeConsoleNotification, err)
-		statusHandler.AddConditions(status.HandleProgressingOrDegraded("ConsoleNotificationSync", reason, err))
 	}
+	statusHandler.AddConditions(status.HandleProgressingOrDegraded("ConsoleNotificationSync", reason, err))
 	return statusHandler.FlushAndReturn(err)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ func (c *UpgradeNotificationController) Sync(ctx context.Context, controllerCont`
`94`	`94`	`reason, err := c.syncClusterUpgradeNotification(ctx)`
`95`	`95`	`if err != nil {`
`96`	`96`	`klog.V(4).Infof("error syncing %s consolenotification custom resource: %s", api.UpgradeConsoleNotification, err)`
`97`		`- statusHandler.AddConditions(status.HandleProgressingOrDegraded("ConsoleNotificationSync", reason, err))`
`98`	`97`	`}`
	`98`	`+ statusHandler.AddConditions(status.HandleProgressingOrDegraded("ConsoleNotificationSync", reason, err))`
`99`	`99`	`return statusHandler.FlushAndReturn(err)`
`100`	`100`	`}`
`101`	`101`