fix: fix & rename health-analyzer and korrel8r clusterrolebindings (#937)

Author: tremes

pkg/controllers/uiplugin/components.go

@@ -35,6 +35,7 @@ const (
 	OpenshiftLoggingNs     = "openshift-logging"
 	OpenshiftNetobservNs   = "netobserv"
 	OpenshiftTracingNs     = "openshift-tracing"
+	monitorClusterroleName = "cluster-monitoring-view"
 
 	annotationPrefix = "observability.openshift.io/ui-plugin-"
 )
@@ -121,7 +122,7 @@ func pluginComponentReconcilers(plugin *uiv1alpha1.UIPlugin, pluginInfo UIPlugin
 			monitoringConfig.Incidents.Enabled &&
 			pluginInfo.HealthAnalyzerImage != ""
 		components = append(components,
-			reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "cluster-monitoring-view", plugin.Name+"cluster-monitoring-view"), plugin, incidentsEnabled),
+			reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, monitorClusterroleName, plugin.Name+"-"+monitorClusterroleName), plugin, incidentsEnabled),
 			reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "system:auth-delegator", serviceAccountName+"-system-auth-delegator"), plugin, incidentsEnabled),
 			reconciler.NewOptionalUpdater(newAlertManagerViewRoleBinding(serviceAccountName, namespace), plugin, incidentsEnabled),
 			reconciler.NewOptionalUpdater(newHealthAnalyzerPrometheusRole(namespace), plugin, incidentsEnabled),

pkg/controllers/uiplugin/troubleshooting_panel.go

@@ -19,9 +19,8 @@ import (
 )
 
 const (
-	korrel8rSvcName        = "korrel8r"
-	monitorClusterroleName = "cluster-monitoring"
-	alertmanagerRoleName   = "monitoring-alertmanager-view"
+	korrel8rSvcName      = "korrel8r"
+	alertmanagerRoleName = "monitoring-alertmanager-view"
 )
 
 func createTroubleshootingPanelPluginInfo(plugin *uiv1alpha1.UIPlugin, namespace, name, image string, features []string) (*UIPluginInfo, error) {
@@ -40,6 +39,7 @@ func createTroubleshootingPanelPluginInfo(plugin *uiv1alpha1.UIPlugin, namespace
 		extraArgs = append(extraArgs, fmt.Sprintf("-features=%s", strings.Join(features, ",")))
 	}
 
+	serviceAccountName := plugin.Name + serviceAccountSuffix
 	pluginInfo := &UIPluginInfo{
 		Image:             image,
 		Name:              plugin.Name,
@@ -101,7 +101,7 @@ func createTroubleshootingPanelPluginInfo(plugin *uiv1alpha1.UIPlugin, namespace
 				{
 					APIGroup:  corev1.SchemeGroupVersion.Group,
 					Kind:      "ServiceAccount",
-					Name:      plugin.Name + "-sa",
+					Name:      serviceAccountName,
 					Namespace: namespace,
 				},
 			},
@@ -115,8 +115,8 @@ func createTroubleshootingPanelPluginInfo(plugin *uiv1alpha1.UIPlugin, namespace
 			korrel8rClusterRole(korrel8rSvcName),
 		},
 		ClusterRoleBindings: []*rbacv1.ClusterRoleBinding{
-			korrel8rClusterRoleBinding(monitorClusterroleName, plugin.Name, namespace),
-			korrel8rClusterRoleBinding(korrel8rSvcName, plugin.Name, namespace),
+			newClusterRoleBinding(namespace, serviceAccountName, monitorClusterroleName, plugin.Name+"-"+monitorClusterroleName),
+			newClusterRoleBinding(namespace, serviceAccountName, korrel8rSvcName+"-view", plugin.Name+"-"+korrel8rSvcName),
 		},
 	}
 
@@ -237,29 +237,3 @@ func korrel8rClusterRole(name string) *rbacv1.ClusterRole {
 		},
 	}
 }
-
-func korrel8rClusterRoleBinding(name string, serviceAccountName string, namespace string) *rbacv1.ClusterRoleBinding {
-	korrel8rClusterroleBindingName := name + "-view"
-	return &rbacv1.ClusterRoleBinding{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: rbacv1.SchemeGroupVersion.String(),
-			Kind:       "ClusterRoleBinding",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: korrel8rClusterroleBindingName,
-		},
-		Subjects: []rbacv1.Subject{
-			{
-				APIGroup:  corev1.SchemeGroupVersion.Group,
-				Kind:      "ServiceAccount",
-				Name:      serviceAccountName + "-sa",
-				Namespace: namespace,
-			},
-		},
-		RoleRef: rbacv1.RoleRef{
-			APIGroup: rbacv1.SchemeGroupVersion.Group,
-			Kind:     "ClusterRole",
-			Name:     korrel8rClusterroleBindingName,
-		},
-	}
-}