Skip to content

OCPBUGS-58422: Route controller should return prematurely if ingress capability is disabled #1008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

OCPBUGS-58422: Route controller should return prematurely if ingress capability is disabled #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d14ded
Route controller should return prematuraly if ingress capability is d…
jhadvig Jul 2, 2025
07d0fd7
OCPBUGS-58434: Console-operator should report plugin services as rela…
jhadvig Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/console/controllers/route/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
13 changes: 11 additions & 2 deletions pkg/console/starter/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,20 +456,29 @@ 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{})
if err != nil {
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
})

Expand Down