Skip to content

Commit 5f7c35c

Browse files
committed
fix: monitoring: create unique cluster roles
Otherwise two stack with the same name in two namespaces try to create the same cluster roles. Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
1 parent 37b64f3 commit 5f7c35c

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func stackComponentReconcilers(
5050
) []reconciler.Reconciler {
5151
prometheusName := ms.Name + "-prometheus"
5252
alertmanagerName := ms.Name + "-alertmanager"
53+
namespace := ms.Namespace
5354
additionalScrapeConfigsSecretName := ms.Name + "-self-scrape"
5455
hasNsSelector := ms.Spec.NamespaceSelector != nil
5556
createCRB := hasNsSelector && ms.Spec.CreateClusterRoleBindings == stack.CreateClusterRoleBindings
@@ -58,7 +59,7 @@ func stackComponentReconcilers(
5859
return []reconciler.Reconciler{
5960
// Prometheus Deployment
6061
reconciler.NewUpdater(newServiceAccount(prometheusName, ms.Namespace), ms),
61-
reconciler.NewUpdater(newPrometheusClusterRole(prometheusName, rbacVerbs), ms),
62+
reconciler.NewUpdater(newPrometheusClusterRole(prometheusName+"-"+namespace, rbacVerbs), ms),
6263
reconciler.NewUpdater(newAdditionalScrapeConfigsSecret(ms, additionalScrapeConfigsSecretName), ms),
6364
reconciler.NewUpdater(newPrometheus(ms, prometheusName,
6465
additionalScrapeConfigsSecretName,
@@ -74,7 +75,7 @@ func stackComponentReconcilers(
7475
reconciler.NewOptionalUpdater(newClusterRoleBinding(ms, prometheusName), ms, createCRB),
7576
reconciler.NewOptionalUpdater(newRoleBindingForClusterRole(ms, prometheusName), ms, !hasNsSelector),
7677

77-
reconciler.NewOptionalUpdater(newAlertManagerClusterRole(alertmanagerName, rbacVerbs), ms, deployAlertmanager),
78+
reconciler.NewOptionalUpdater(newAlertManagerClusterRole(alertmanagerName+"-"+namespace, rbacVerbs), ms, deployAlertmanager),
7879

7980
// create clusterrolebinding if alertmanager is enabled and namespace selector is also present in MonitoringStack
8081
reconciler.NewOptionalUpdater(newClusterRoleBinding(ms, alertmanagerName), ms, deployAlertmanager && createCRB),

0 commit comments

Comments
 (0)