-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Add static value source for replacement #5630
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add static value source for replacement #5630
Conversation
|
|
|
Welcome @cunyat! |
|
Hi @cunyat. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
ac70b7c to
53100b0
Compare
varshaprasad96
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cnmcavoy Thanks for the PR! Just one nit, which would be nice to fix.
Also, looks like the linter is failing. It's not related to changes in this PR, but if we merge it without getting all the tests green then we would end up failing all the PRs. Could you please all fix it.
| } | ||
|
|
||
| func getReplacement(nodes []*yaml.RNode, r *types.Replacement) (*yaml.RNode, error) { | ||
| if r.SourceValue != nil && r.Source != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we already have check while reading yaml nodes to not allow nil while adding elements to Replacements list. But can we do an early return if r == nil to avoid nil pointers just in case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually this can be done in Filter itself.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know if I'm understanding it.
In Filter function, replacements is an slice of type []types.Replacement, so their elements should not be nil.
Inside getReplacement function, as I can see, it's passed by reference so it can modify the field path to the default one in case it is not given.
As I see it, inside the for loop on Filter function, r cannot be nil, don't know if I'm missing something, sorry 😅
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe @varshaprasad96 care about getReplacement() is called other places and that is better to handle error instead of reference field in nil value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But, This func is private and we have never checked that before.
I think acceptable this time and We can fix next PR.
|
/ok-to-test |
|
This PR has multiple commits, and the default merge method is: merge. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
Introduces `sourceValue` on replacement object for replacing from a static value instead of sourcing from another object. Solves kubernetes-sigs#5516
55977b9 to
6c27970
Compare
I've removed the commit fixing that test as it is already fixed in upstream |
|
HI @varshaprasad96 |
|
I deleted my previous comment (asking when this will be merged) upon further reflection. See #5063 (comment) for the rationale. |
|
The Kubernetes project currently lacks enough contributors to adequately respond to all PRs. This bot triages PRs according to the following rules:
You can:
Please send feedback to sig-contributor-experience at kubernetes/community. /lifecycle stale |
|
/remove-lifecycle stale |
|
The Kubernetes project currently lacks enough contributors to adequately respond to all PRs. This bot triages PRs according to the following rules:
You can:
Please send feedback to sig-contributor-experience at kubernetes/community. /lifecycle stale |
|
I'll check it. |
|
/remove-lifecycle stale |
|
@cunyat /lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cunyat, koba1t The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [kubernetes-sigs/kustomize](https://github.com/kubernetes-sigs/kustomize) | minor | `v5.6.0` -> `v5.7.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>kubernetes-sigs/kustomize (kubernetes-sigs/kustomize)</summary> ### [`v5.7.0`](https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize/v5.7.0) [Compare Source](kubernetes-sigs/kustomize@kustomize/v5.6.0...kustomize/v5.7.0) #### Feature kubernetes-sigs/kustomize#5630: Add static value source for replacement kubernetes-sigs/kustomize#5921: feat: Add images suport for Image Volumes kubernetes-sigs/kustomize#5771: fix: Allow patches with empty files with multiple newlines or comments kubernetes-sigs/kustomize#5865: feat(helm): allow the use of devel alias for helmcharts #### fix kubernetes-sigs/kustomize#5846: fix: Get version from the BuildInfo.Main.Version if not found in deps and build flag kubernetes-sigs/kustomize#5859: fix: Don't panic on multiple $patch: delete strategic merge patches in a single patch file kubernetes-sigs/kustomize#5877: fix: make private one field in replacements transformer struct that had a missing JSON tag #### Dependencies [#​5847](kubernetes-sigs/kustomize#5847): replace deplecated package github.com/google/shlex with github.com/carapace-sh/carapace-shlex [#​5873](kubernetes-sigs/kustomize#5873): Bump to github.com/spf13/viper v1.20.0 [#​5931](kubernetes-sigs/kustomize#5931): Drop usage of forked copies of goyaml.v2 and goyaml.v3 #### chore kubernetes-sigs/kustomize#5882: Set Git messages to English for TestRemoteLoad\_LocalProtocol [#​5934](kubernetes-sigs/kustomize#5934): Update kyaml to v0.20.0 [#​5935](kubernetes-sigs/kustomize#5935): Update cmd/config to v0.20.0 [#​5936](kubernetes-sigs/kustomize#5936): Update api to v0.20.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC42Mi4xIiwidXBkYXRlZEluVmVyIjoiNDAuNjIuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Introduces
sourceValuekey on replacement for replacing from a static value instead of sourcing from another object.Solves #5516