Merge branch 'release-1.2' into perses-rbac

Author: jgbernalp

cmd/operator/main.go

@@ -48,9 +48,9 @@ var defaultImages = map[string]string{
 	"ui-logging":                 "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.1",
 	"korrel8r":                   "quay.io/korrel8r/korrel8r:release-coo-1.2",
 	"health-analyzer":            "quay.io/openshiftanalytics/cluster-health-analyzer:v0.5.0",
-	"ui-monitoring-pf5":          "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.4.0",
-	"ui-monitoring":              "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.5.0",
-	"perses":                     "quay.io/openshift-observability-ui/perses:v0.51-go-1.23",
+	"ui-monitoring-pf5":          "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.4.2",
+	"ui-monitoring":              "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.5.1",
+	"perses":                     "quay.io/openshift-observability-ui/perses:v0.51.1",
 }
 
 func imagesUsed() []string {

pkg/controllers/uiplugin/components.go

@@ -128,9 +128,6 @@ func pluginComponentReconcilers(plugin *uiv1alpha1.UIPlugin, pluginInfo UIPlugin
 		components = append(components, reconciler.NewUpdater(newPersesClusterRole(), plugin))
 		components = append(components, reconciler.NewUpdater(newClusterRoleBinding(namespace, persesServiceAccountName, "perses-cr", persesServiceAccountName+":perses-cr"), plugin))
 		components = append(components, reconciler.NewUpdater(newPerses(namespace, pluginInfo.PersesImage), plugin))
-	}
-
-	if plugin.Spec.Type == uiv1alpha1.TypeMonitoring {
 		components = append(components, reconciler.NewUpdater(newAcceleratorsDatasource(namespace), plugin))
 		components = append(components, reconciler.NewUpdater(newAcceleratorsDashboard(namespace), plugin))
 	}