Merge pull request #900 from TheRealJon/OCPBUGS-33505

openshift-merge-bot[bot] · web-flow · commit 94215c01b82f · 2024-05-15T14:16:35.000Z
OCPBUGS-33505: Add missing return statement to fix crash in healthcheck controller
diff --git a/pkg/console/controllers/healthcheck/controller.go b/pkg/console/controllers/healthcheck/controller.go
@@ -139,7 +139,7 @@ func (c *HealthCheckController) Sync(ctx context.Context, controllerContext fact
 	activeRoute, activeRouteErr := c.routeClient.Routes(api.OpenShiftConsoleNamespace).Get(ctx, activeRouteName, metav1.GetOptions{})
 	statusHandler.AddConditions(status.HandleProgressingOrDegraded("RouteHealth", "FailedRouteGet", activeRouteErr))
 	if activeRouteErr != nil {
-		statusHandler.FlushAndReturn(activeRouteErr)
+		return statusHandler.FlushAndReturn(activeRouteErr)
 	}
 
 	routeHealthCheckErrReason, routeHealthCheckErr := c.CheckRouteHealth(ctx, updatedOperatorConfig, activeRoute)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (c *HealthCheckController) Sync(ctx context.Context, controllerContext fact`
`139`	`139`	`activeRoute, activeRouteErr := c.routeClient.Routes(api.OpenShiftConsoleNamespace).Get(ctx, activeRouteName, metav1.GetOptions{})`
`140`	`140`	`statusHandler.AddConditions(status.HandleProgressingOrDegraded("RouteHealth", "FailedRouteGet", activeRouteErr))`
`141`	`141`	`if activeRouteErr != nil {`
`142`		`- statusHandler.FlushAndReturn(activeRouteErr)`
	`142`	`+ return statusHandler.FlushAndReturn(activeRouteErr)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`routeHealthCheckErrReason, routeHealthCheckErr := c.CheckRouteHealth(ctx, updatedOperatorConfig, activeRoute)`