From 5d14ded00b86349f99ac39859fca4177d8324561 Mon Sep 17 00:00:00 2001 From: Jakub Hadvig Date: Wed, 2 Jul 2025 13:42:42 +0200 Subject: [PATCH 1/2] Route controller should return prematuraly if ingress capability is disabled --- pkg/console/controllers/route/controller.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/console/controllers/route/controller.go b/pkg/console/controllers/route/controller.go index 438e44d17..7ec25fc35 100644 --- a/pkg/console/controllers/route/controller.go +++ b/pkg/console/controllers/route/controller.go @@ -142,11 +142,6 @@ func (c *RouteSyncController) Sync(ctx context.Context, controllerContext factor return statusHandler.FlushAndReturn(err) } - ingressControllerConfig, err := c.ingressControllerLister.IngressControllers(api.IngressControllerNamespace).Get(api.DefaultIngressController) - if err != nil { - return statusHandler.FlushAndReturn(err) - } - clusterVersionConfig, err := c.clusterVersionLister.Get("version") if err != nil { return statusHandler.FlushAndReturn(err) @@ -159,6 +154,11 @@ func (c *RouteSyncController) Sync(ctx context.Context, controllerContext factor return statusHandler.FlushAndReturn(nil) } + ingressControllerConfig, err := c.ingressControllerLister.IngressControllers(api.IngressControllerNamespace).Get(api.DefaultIngressController) + if err != nil { + return statusHandler.FlushAndReturn(err) + } + ingressConfig, err := c.ingressConfigLister.Get(api.ConfigResourceName) if err != nil { return statusHandler.FlushAndReturn(err) From 07d0fd786652926cc36105485a26317fccb55ba4 Mon Sep 17 00:00:00 2001 From: Jakub Hadvig Date: Mon, 7 Jul 2025 15:09:32 +0200 Subject: [PATCH 2/2] OCPBUGS-58434: Console-operator should report plugin services as relatedObjects --- pkg/console/starter/starter.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/console/starter/starter.go b/pkg/console/starter/starter.go index de2b81f38..b6e01d360 100644 --- a/pkg/console/starter/starter.go +++ b/pkg/console/starter/starter.go @@ -456,6 +456,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle ) // Show all ConsolePlugin instances as related objects + // Show all namespaces that are used by ConsolePlugin instances as related objects clusterOperatorStatus.WithRelatedObjectsFunc(func() (bool, []configv1.ObjectReference) { relatedObjects := []configv1.ObjectReference{} consolePlugins, err := consoleClient.ConsoleV1().ConsolePlugins().List(ctx, metav1.ListOptions{}) @@ -463,13 +464,21 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle return false, nil } for _, plugin := range consolePlugins.Items { - relatadPlugin := configv1.ObjectReference{ + relatedObjects = append(relatedObjects, configv1.ObjectReference{ Group: "console.openshift.io", Resource: "consoleplugins", Name: plugin.GetName(), + }) + if plugin.Spec.Backend.Service != nil { + ns := plugin.Spec.Backend.Service.Namespace + relatedObjects = append(relatedObjects, configv1.ObjectReference{ + Group: corev1.GroupName, + Resource: "namespaces", + Name: ns, + }) } - relatedObjects = append(relatedObjects, relatadPlugin) } + return true, relatedObjects })