Add missing return statement to fix crash in healthcheck controller

TheRealJon · TheRealJon · commit efdff17cfcf2 · 2024-05-10T13:29:09.000-04:00
diff --git a/pkg/console/controllers/healthcheck/controller.go b/pkg/console/controllers/healthcheck/controller.go
@@ -137,7 +137,7 @@ func (c *HealthCheckController) Sync(ctx context.Context, controllerContext fact
 	activeRoute, activeRouteErr := c.routeLister.Routes(api.OpenShiftConsoleNamespace).Get(activeRouteName)
 	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
`@@ -137,7 +137,7 @@ func (c *HealthCheckController) Sync(ctx context.Context, controllerContext fact`
`137`	`137`	`activeRoute, activeRouteErr := c.routeLister.Routes(api.OpenShiftConsoleNamespace).Get(activeRouteName)`
`138`	`138`	`statusHandler.AddConditions(status.HandleProgressingOrDegraded("RouteHealth", "FailedRouteGet", activeRouteErr))`
`139`	`139`	`if activeRouteErr != nil {`
`140`		`- statusHandler.FlushAndReturn(activeRouteErr)`
	`140`	`+ return statusHandler.FlushAndReturn(activeRouteErr)`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`routeHealthCheckErrReason, routeHealthCheckErr := c.CheckRouteHealth(ctx, updatedOperatorConfig, activeRoute)`