Merge monitoring PrometheusRule ordering fix

This commit is contained in:
jakman85 committed 2026-08-21 22:30:02 -05:00
commit 4f17c5334e
2 files changed
+5 -1

No files matched your search

+2
View File
@@ -29,3 +29,5 @@ resources:
# cilium: L2 LB IP pool + announcement policy (cilium.io CRDs already registered by Cilium) # cilium: L2 LB IP pool + announcement policy (cilium.io CRDs already registered by Cilium)
- cilium/l2-ip-pool.yaml - cilium/l2-ip-pool.yaml
- cilium/l2-announcement-policy.yaml - cilium/l2-announcement-policy.yaml
# monitoring: PrometheusRule alert rules (need monitoring.coreos.com CRDs from kube-prometheus-stack)
- ../platform/monitoring/alerts.yaml
+3 -1
View File
@@ -7,6 +7,8 @@ resources:
- kube-prometheus-stack.yaml - kube-prometheus-stack.yaml
- loki.yaml - loki.yaml
- alloy.yaml - alloy.yaml
- alerts.yaml # NOTE: alerts.yaml (PrometheusRule CRs) needs the monitoring.coreos.com CRDs that the
# kube-prometheus-stack HelmRelease above installs → applied by the platform-config Kustomization
# (dependsOn platform) so the CRDs exist first. File stays here for locality.
- grafana-admin-credentials.sops.yaml - grafana-admin-credentials.sops.yaml
- alertmanager-smtp.sops.yaml - alertmanager-smtp.sops.yaml