Repository navigation
feat(chart): support custom labels and annotations on controller pods - #966
Merged
Merged
Conversation
Add podLabels and podAnnotations values to the Helm chart so users can attach custom metadata to moco-controller Pods. Chart-managed labels and annotations take precedence over user-supplied values. Closes cybozu-go#743 Signed-off-by: CJstate <[email protected]>
arosh
approved these changes
Nov 11, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues are reported for the Helm chart’s optional controller pod labels and annotations.
No open issues 🎉
What changed in this PR
Adds optional custom labels and annotations to MOCO controller pods through the Helm chart, addressing issue #743.
Changes:
- Introduces
podLabelsandpodAnnotations, both defaulting to empty maps. - Merges custom metadata into the controller pod template while preserving chart-defined values on key conflicts.
- Documents the new options in the README and changelog.
| File | Description |
|---|---|
charts/moco/values.yaml |
Defines the optional pod metadata values and their defaults. |
charts/moco/templates/deployment.yaml |
Merges custom pod metadata with chart-defined metadata. |
charts/moco/README.md |
Documents the values and conflict precedence. |
charts/moco/CHANGELOG.md |
Records the feature and links issue #743. |
Review effort: Balanced
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.
Summary
Adds optional
podLabelsandpodAnnotationsvalues to the MOCO Helm chart so operators can attach custom metadata to the controller pods.charts/moco/values.yaml: newpodLabels: {}andpodAnnotations: {}.charts/moco/templates/deployment.yaml: merge the custom maps into the pod template metadata. Chart-defined labels and annotations keep precedence on key conflicts.charts/moco/README.mdandcharts/moco/CHANGELOG.md: document the new values.Closes #743.
Verification
helm lint charts/mocohelm templatewith custom labels/annotations confirmed they appear on the controller pod template and that chart-defined values win when keys collide.