Skip to content

COO-1511: fix: reorder resource updates to cause fewer errors. #998

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

Merged
openshift-merge-bot merged 1 commit into from
Feb 19, 2026
Merged

COO-1511: fix: reorder resource updates to cause fewer errors. #998

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
27 changes: 14 additions & 13 deletions pkg/controllers/monitoring/monitoring-stack/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,31 @@ func stackComponentReconcilers(
deployAlertmanager := !ms.Spec.AlertmanagerConfig.Disabled

return []reconciler.Reconciler{
// Prometheus Deployment
// Create RBAC
reconciler.NewUpdater(newServiceAccount(prometheusName, ms.Namespace), ms),
reconciler.NewUpdater(newPrometheusClusterRole(prometheusName, rbacVerbs), ms),
reconciler.NewUpdater(newAdditionalScrapeConfigsSecret(ms, additionalScrapeConfigsSecretName), ms),
reconciler.NewUpdater(newPrometheus(ms, prometheusName,
additionalScrapeConfigsSecretName,
thanos, prometheus), ms),
reconciler.NewUpdater(newPrometheusService(ms), ms),
reconciler.NewUpdater(newThanosSidecarService(ms), ms),
reconciler.NewOptionalUpdater(newPrometheusPDB(ms), ms,
*ms.Spec.PrometheusConfig.Replicas > 1),

// Alertmanager Deployment
reconciler.NewOptionalUpdater(newServiceAccount(alertmanagerName, ms.Namespace), ms, deployAlertmanager),

reconciler.NewUpdater(newPrometheusClusterRole(prometheusName, rbacVerbs), ms),
// create clusterrolebinding if nsSelector's present otherwise a rolebinding
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 && createCRB),
reconciler.NewOptionalUpdater(newRoleBindingForClusterRole(ms, alertmanagerName), ms, deployAlertmanager && !hasNsSelector),

// Prometheus Deployment
reconciler.NewUpdater(newPrometheus(ms, prometheusName,
additionalScrapeConfigsSecretName,
thanos, prometheus), ms),
reconciler.NewUpdater(newPrometheusService(ms), ms),
reconciler.NewUpdater(newThanosSidecarService(ms), ms),
reconciler.NewUpdater(newAdditionalScrapeConfigsSecret(ms, additionalScrapeConfigsSecretName), ms),
reconciler.NewOptionalUpdater(newPrometheusPDB(ms), ms,
*ms.Spec.PrometheusConfig.Replicas > 1),

// Alertmanager Deployment
reconciler.NewOptionalUpdater(newAlertmanager(ms, alertmanagerName, alertmanager), ms, deployAlertmanager),
reconciler.NewOptionalUpdater(newAlertmanagerService(ms), ms, deployAlertmanager),
reconciler.NewOptionalUpdater(newAlertmanagerPDB(ms), ms, deployAlertmanager && *ms.Spec.AlertmanagerConfig.Replicas > 1),
Expand Down