fix(charts): emit leading document separators in monitoring partials - #2368
Merged
Conversation
The routerlib service-monitor and rbac partials open their conditional bodies without a leading '---'. Include sites chain partials on adjacent lines and rely on each partial to separate itself, so with router.monitoring.prometheus.enabled=true the rendered ServiceMonitor continues the preceding EPP Service document, forming one YAML document with duplicate root keys. Helm parses that document last-key-wins as a ServiceMonitor and the Service drops out of the release inventory: an upgrade that enables monitoring deletes the live Service, a fresh install with monitoring enabled never creates it, and Helm reports no error. Observed on GKE with Helm v4.2.0. The rbac partial fails the same way when the service-monitor partial renders empty (prometheus enabled with a provider other than prometheusoperator): its ClusterRole fuses onto the Service. Add a leading '---' inside each conditional, matching _leader-election-rbac.yaml. Signed-off-by: Luke Van Drie <lukevandrie@google.com>
LukeAVanDrie
force-pushed
the
fix-fused-manifest-docs
branch
from
August 12, 2026 18:11
218c346 to
5f1df22
Compare
LukeAVanDrie
marked this pull request as ready for review
August 12, 2026 18:13
ahg-g
approved these changes
Aug 14, 2026
Collaborator
|
pls send a patch to release-0.10 branch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
The routerlib service-monitor and rbac partials open their conditional bodies without a leading
---. Include sites chain partials on adjacent lines and rely on each partial to separate itself, so withrouter.monitoring.prometheus.enabled=truethe rendered ServiceMonitor continues the preceding EPP Service document, forming one YAML document with duplicate root keys. Helm parses that document last-key-wins as a ServiceMonitor and the Service drops out of the release inventory: an upgrade that enables monitoring deletes the live Service, a fresh install with monitoring enabled never creates it, and Helm reports no error. Observed on GKE with Helm v4.2.0; the audit log shows aservices.deleteissued by Helm during the upgrade.The rbac partial fails the same way when the service-monitor partial renders empty (prometheus enabled with a provider other than prometheusoperator): its ClusterRole fuses onto the Service.
The fix adds a leading
---inside each partial's conditional, matching_leader-election-rbac.yaml.Verified with
helm templateon the standalone chart, strict-parsing the output: with the prometheusoperator provider the parsed manifest set gains the missingService(13 documents before, 14 after); with the gmp provider likewise (18 before, 19 after). No other document changes.Which issue(s) this PR fixes:
Ad hoc fix
Release note: