WIP 🐛 fix(helm/v2-alpha): Respect --force for default ServiceMonitor file#5726
Open
camilamacedo86 wants to merge 1 commit into
Open
WIP 🐛 fix(helm/v2-alpha): Respect --force for default ServiceMonitor file#5726camilamacedo86 wants to merge 1 commit into
camilamacedo86 wants to merge 1 commit into
Conversation
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: camilamacedo86 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
cncf-cla: yes
There was a problem hiding this comment.
Pull request overview
This PR updates the Kubebuilder helm/v2-alpha plugin so the default fallback ServiceMonitor template respects the --force flag (preserving user modifications during chart regeneration unless --force is used), aligning its behavior with the existing NetworkPolicy fallback handling.
Changes:
- Update the ServiceMonitor fallback template to skip overwriting existing files unless
--forceis set. - Extend integration coverage to validate
--forcebehavior for the fallback ServiceMonitor file. - Add unit tests and refresh CLI/docs text describing preserved/regenerated files.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/plugins/optional/helm/v2alpha/scaffolds/test/force_integration_test.go | Extends integration tests to ensure the fallback ServiceMonitor file is preserved without --force and overwritten with --force. |
| pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/chart-templates/servicemonitor.go | Changes default ServiceMonitor fallback behavior to SkipFile unless Force is true. |
| pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/chart-templates/servicemonitor_test.go | Adds unit tests verifying IfExistsAction is set correctly based on Force. |
| pkg/plugins/optional/helm/v2alpha/edit.go | Updates edit command help text to document preserved files and include the fallback ServiceMonitor path. |
| pkg/plugins/optional/helm/v2alpha/edit_test.go | Updates tests to assert the updated help/usage strings mention the fallback ServiceMonitor path. |
| docs/book/src/plugins/available/helm-v2-alpha.md | Updates plugin documentation to reflect preserved files and the fallback ServiceMonitor location. |
Comment on lines
114
to
118
| ├── monitoring/ | ||
| │ └── servicemonitor.yaml | ||
| │ └── servicemonitor.yaml # When kustomize output provides a ServiceMonitor | ||
| ├── prometheus/ | ||
| │ └── controller-manager-metrics-monitor.yaml # Default fallback when kustomize output does not | ||
| ├── network-policy/ |
Comment on lines
+109
to
+113
| fs.BoolVar(&p.force, "force", false, | ||
| "If set, regenerate preserved files except Chart.yaml (values.yaml, NOTES.txt, _helpers.tpl, "+ | ||
| ".helmignore, test-chart.yml, network-policy/allow-metrics-traffic.yaml, "+ | ||
| "network-policy/allow-webhook-traffic.yaml, "+ | ||
| "prometheus/controller-manager-metrics-monitor.yaml)") |
camilamacedo86
changed the title
k8s-ci-robot
added
the
do-not-merge/work-in-progress
Wire the ServiceMonitor scaffold Force flag to SkipFile/OverwriteFile so prometheus/controller-manager-metrics-monitor.yaml is preserved without --force. Co-authored-by: Cursor <cursoragent@cursor.com>
camilamacedo86
force-pushed
the
fix-force-servicemonitor
branch
from
9b5b2e1 to
9cc0b51
Compare
|
k8s-ci-robot
added
cncf-cla: no
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.
Ensures that ServiceMonitor templates follow the same behavior of Network Policies (introduced
Follow-up to #5708) which either is added when not found, preserving user customizations during chart regeneration instead of overwriting them.