unkin/argocd-apps
3
0
Fork 0
Code Issues 7 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

grafana: drop alerting Service and POD_IP env owned by grafana-operator #510

Merged
benvin merged 1 commits from benvin/grafana-alerting-dedupe into main 2026-10-02 22:44:54 +10:00
Conversation 1 Commits 1 Files Changed 3
-25
unkin-agent commented 2026-10-02 22:41:05 +10:00
Member
Copy Link
Copy Source

grafana-operator already creates the headless grafana-alerting Service (port 9094) and injects POD_IP into the grafana container, so the copies added in #509 make Argo CD and the operator fight over the same objects.

  • remove service-alerting.yaml from the grafana base
  • remove the POD_IP env entry from the Grafana CR
  • keep the unified_alerting ha_* config, which targets the operator's Service
grafana-operator already creates the headless `grafana-alerting` Service (port 9094) and injects `POD_IP` into the grafana container, so the copies added in #509 make Argo CD and the operator fight over the same objects. - remove `service-alerting.yaml` from the grafana base - remove the `POD_IP` env entry from the Grafana CR - keep the `unified_alerting` `ha_*` config, which targets the operator's Service
unkin-agent added 1 commit 2026-10-02 22:41:05 +10:00
grafana: drop alerting Service and POD_IP env owned by grafana-operator
ci/woodpecker/pr/pre-commit Pipeline was successful
Details
ci/woodpecker/pr/kubeconform Pipeline was successful
Details
adaa74e9e2
unkin-agent commented 2026-10-02 22:41:50 +10:00
Author
Member
Copy Link
Copy Source
  • apps/base/grafana/grafana.yaml:50 — nit: operator grafana-alerting Service sets no publishNotReadyAddresses (the removed one did), so ha_peers DNS lists only Ready pods; on a cold 3-replica start peers are found only after readiness (gossip retries, converges). Accept, or confirm HA forms after rollout.
- apps/base/grafana/grafana.yaml:50 — nit: operator `grafana-alerting` Service sets no `publishNotReadyAddresses` (the removed one did), so `ha_peers` DNS lists only Ready pods; on a cold 3-replica start peers are found only after readiness (gossip retries, converges). Accept, or confirm HA forms after rollout.
benvin merged commit 5a8559e97c into main 2026-10-02 22:44:54 +10:00
benvin deleted branch benvin/grafana-alerting-dedupe 2026-10-02 22:44:54 +10:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
benvin (BenVincent) unkin-agent (Unkin Agent) unkinben (Ben Vincent)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: unkin/argocd-apps#510
Delete Branch "benvin/grafana-alerting-dedupe"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?