feat: create ClusterRoleBIndings based on API field (#888)

Signed-off-by: Jan Fajerski <[email protected]>

Author: jan--f

go.mod

@@ -34,6 +34,7 @@ require (
 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240404200104-96ed2d49b255
 
 require (
+	github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251009091129-76135c924ed6
 	github.com/rhobs/perses v0.0.0-20250612171017-5d7686af9ae4
 	github.com/rhobs/perses-operator v0.1.10-0.20250612173146-78eb619430df
 	github.com/stretchr/testify v1.11.1
@@ -117,7 +118,6 @@ require (
 	github.com/prometheus/procfs v0.17.0 // indirect
 	github.com/prometheus/prometheus v0.304.2 // indirect
 	github.com/rhobs/obo-prometheus-operator/pkg/client v0.84.0-rhobs1 // indirect
-	github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251002144945-36f5667d6b8d // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cobra v1.9.1 // indirect

go.sum

@@ -380,8 +380,8 @@ github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.84.0-rhobs1 h1:N
 github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.84.0-rhobs1/go.mod h1:XhxzqYHJ7vGkIelrVaNZeLp2pgj91HNuiRgPdj7S+yI=
 github.com/rhobs/obo-prometheus-operator/pkg/client v0.84.0-rhobs1 h1:R8JvmUX4FkC304JEh43TgUbmAXuFwBAWSZlHXB0AVew=
 github.com/rhobs/obo-prometheus-operator/pkg/client v0.84.0-rhobs1/go.mod h1:nc3DIXRuOYsEybYMdcH2V9BG2xSqtTFRq6Lcd1lOZYk=
-github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251002144945-36f5667d6b8d h1:D0Eq4ZLDqLcy1TqNsrM+7pdhdzZDYHlPEG44HRPgC/o=
-github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251002144945-36f5667d6b8d/go.mod h1:bNP815/mCv8ydNQ2Q3a9gqlx9b2XouWa6hws9vthq78=
+github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251009091129-76135c924ed6 h1:f+J6l48RMDomN9YrDxd0cZVo7+L+a/TCzH6ycat5tMI=
+github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251009091129-76135c924ed6/go.mod h1:bNP815/mCv8ydNQ2Q3a9gqlx9b2XouWa6hws9vthq78=
 github.com/rhobs/perses v0.0.0-20250612171017-5d7686af9ae4 h1:IxpxGJ/fbnRkZZYFm17NMedFyEuOKuf4TS23g+6jMvU=
 github.com/rhobs/perses v0.0.0-20250612171017-5d7686af9ae4/go.mod h1:Mxs4sXawWiV50qokKG1UZCV9NJEdJWsALY71/z38NKA=
 github.com/rhobs/perses-operator v0.1.10-0.20250612173146-78eb619430df h1:rwtqpvrowEF6EjSiO3PPcqC6s2jo7NU3VsGU6yrpxTg=

pkg/controllers/monitoring/monitoring-stack/components.go

@@ -52,6 +52,7 @@ func stackComponentReconcilers(
 	alertmanagerName := ms.Name + "-alertmanager"
 	additionalScrapeConfigsSecretName := ms.Name + "-self-scrape"
 	hasNsSelector := ms.Spec.NamespaceSelector != nil
+	createCRB := hasNsSelector && ms.Spec.CreateClusterRoleBindings == stack.CreateClusterRoleBindings
 	deployAlertmanager := !ms.Spec.AlertmanagerConfig.Disabled
 
 	return []reconciler.Reconciler{
@@ -70,13 +71,13 @@ func stackComponentReconcilers(
 		// Alertmanager Deployment
 		reconciler.NewOptionalUpdater(newServiceAccount(alertmanagerName, ms.Namespace), ms, deployAlertmanager),
 		// create clusterrolebinding if nsSelector's present otherwise a rolebinding
-		reconciler.NewOptionalUpdater(newClusterRoleBinding(ms, prometheusName), ms, hasNsSelector),
+		reconciler.NewOptionalUpdater(newClusterRoleBinding(ms, prometheusName), ms, createCRB),
 		reconciler.NewOptionalUpdater(newRoleBindingForClusterRole(ms, prometheusName), ms, !hasNsSelector),
 
 		reconciler.NewOptionalUpdater(newAlertManagerClusterRole(alertmanagerName, rbacVerbs), ms, deployAlertmanager),
 
 		// create clusterrolebinding if alertmanager is enabled and namespace selector is also present in MonitoringStack
-		reconciler.NewOptionalUpdater(newClusterRoleBinding(ms, alertmanagerName), ms, deployAlertmanager && hasNsSelector),
+		reconciler.NewOptionalUpdater(newClusterRoleBinding(ms, alertmanagerName), ms, deployAlertmanager && createCRB),
 		reconciler.NewOptionalUpdater(newRoleBindingForClusterRole(ms, alertmanagerName), ms, deployAlertmanager && !hasNsSelector),
 
 		reconciler.NewOptionalUpdater(newAlertmanager(ms, alertmanagerName, alertmanager), ms, deployAlertmanager),