Fix remaining empty annotations: keys in chart templates#814
Merged
JorTurFer merged 2 commits intoFeb 15, 2026
Merged
Conversation
Signed-off-by: Eugene Babichev <[email protected]>
Contributor
Author
|
The PR title is wrong 🤦, but I can't update it |
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.
Fix remaining empty
annotations:keys in chart templatesFollow-up to #486 which fixed empty annotation blocks
across almost everywhere, but we still have 3 more:
webhooks/service.yaml: the outer conditional included
prometheus.webhooks.enabledwithout thenot serviceMonitor.enabledguard that manager/service.yaml andmetrics-server/service.yaml both have. When prometheus + serviceMonitor
are both enabled (prometheus.io/* annotations aren't needed), the
annotations block renders empty.
metrics-server/serviceaccount.yaml:
annotations:renderedunconditionally, no outer guard at all.
webhooks/serviceaccount.yaml: same as above.
Empty
annotations:keys cause issues with ArgoCD's ServerSideApply —the apply controller claims ownership of the annotations field, and then
any annotation injected by external controllers (e.g. GKE NEG
controller adding
cloud.google.com/neg) is treated as drift, keepingthe app permanently OutOfSync.
How to reproduce
Checklist
Fixes #397 (although that particular file is already fixed, so should probably be just closed)