Skip to content

Register the console bits no matter in which namespace the operator runs #587

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

Open
mbaldessari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Register the console bits no matter in which namespace the operator runs #587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 12 additions & 19 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,26 +105,19 @@ func main() {

registerComponentOrExit(mgr, argov1beta1api.AddToScheme)

// Register and enable the console plugin only when running in the
// patterns-operator namespace. The legacy openshift-operators namespace
// does not support the UI.
if controllers.DetectOperatorNamespace() != controllers.LegacyOperatorNamespace {
if err := mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
if err := console.CreateOrUpdatePlugin(ctx, mgr.GetClient()); err != nil {
setupLog.Error(err, "unable to create/update console plugin")
}
if err := console.EnablePlugin(ctx, mgr.GetClient()); err != nil {
setupLog.Error(err, "unable to enable console plugin")
}
if err := console.CreateOrUpdateCatalog(ctx, mgr.GetClient(), mgr.GetAPIReader()); err != nil {
setupLog.Error(err, "unable to create/update catalog deployment")
}
return nil
})); err != nil {
setupLog.Error(err, "unable to add console plugin runnable")
if err := mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
if err := console.CreateOrUpdatePlugin(ctx, mgr.GetClient()); err != nil {
setupLog.Error(err, "unable to create/update console plugin")
}
} else {
setupLog.Info("skipping console plugin registration in legacy namespace", "namespace", controllers.LegacyOperatorNamespace)
if err := console.EnablePlugin(ctx, mgr.GetClient()); err != nil {
setupLog.Error(err, "unable to enable console plugin")
}
if err := console.CreateOrUpdateCatalog(ctx, mgr.GetClient(), mgr.GetAPIReader()); err != nil {
setupLog.Error(err, "unable to create/update catalog deployment")
}
return nil
})); err != nil {
setupLog.Error(err, "unable to add console plugin runnable")
}

analyticsEnabled := areAnalyticsEnabled(mgr.GetAPIReader())
Expand Down