Skip to content
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.

Sign up for GitHub

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

Jump to bottom

kustomize edit add replacement #5444

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

kustomize edit add replacement #5444

wants to merge 2 commits into from

Conversation

charles-chenzz
Copy link
Member

fix #4679

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 14, 2023
@annasong20
Copy link
Contributor

/assign

@k8s-ci-robot
Copy link
Contributor

This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

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.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 18, 2023
stormqueen1990
stormqueen1990 reviewed Nov 21, 2023
View reviewed changes
Copy link
Member

@stormqueen1990 stormqueen1990 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some suggestions!

kustomize/commands/edit/add/addreplacement.go Outdated Show resolved Hide resolved
kustomize/commands/edit/add/addreplacement.go Show resolved Hide resolved
kustomize/commands/edit/add/addreplacement.go Outdated Show resolved Hide resolved
kustomize/commands/edit/add/addreplacement_test.go Show resolved Hide resolved
kustomize/commands/edit/add/addreplacement_test.go Show resolved Hide resolved
kustomize/commands/edit/add/all.go Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2023
stormqueen1990
stormqueen1990 reviewed Nov 24, 2023
View reviewed changes
kustomize/go.sum Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 7, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 9, 2023
@charles-chenzz charles-chenzz force-pushed the kustomize_edit_add_replacement branch 4 times, most recently from 9b7c3b0 to 1fb4bdf Compare December 9, 2023 06:06
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 25, 2024
stormqueen1990
stormqueen1990 reviewed Jan 27, 2024
View reviewed changes
Copy link
Member

@stormqueen1990 stormqueen1990 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work here! 🎉

This is mostly LGTM, I just see one lint failure. I think we could also revert the go.work.sum change, since your code is not adding new modules. What do you think?

go.work.sum Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't look like your code changes should have updated this (I don't see any new modules). Do you think this can be reverted for this PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the update is resolved the need-rebase label

kustomize/commands/edit/add/addreplacement_test.go Outdated Show resolved Hide resolved
@stormqueen1990
Copy link
Member

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 27, 2024
stormqueen1990
stormqueen1990 reviewed Feb 7, 2024
View reviewed changes
Copy link
Member

@stormqueen1990 stormqueen1990 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 7, 2024
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 26, 2024
stormqueen1990
stormqueen1990 reviewed Feb 28, 2024
View reviewed changes
Copy link
Member

@stormqueen1990 stormqueen1990 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 28, 2024
@charles-chenzz
Copy link
Member Author

would you mind approve @stormqueen1990 ? seems like you're approver of command(except build)

koba1t
koba1t requested changes Mar 4, 2024
View reviewed changes
kustomize/commands/edit/add/addreplacement.go
Comment on lines +66 to +71
for _, r := range m.Replacements {
if len(r.Path) > 0 && r.Path == o.Replacement.Path {
return fmt.Errorf("replacement for path %q already in %s file", r.Path, konfig.DefaultKustomizationFileName())
}
}
m.Replacements = append(m.Replacements, o.Replacement)
Copy link
Member

@koba1t koba1t Mar 4, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @charles-chenzz
Could you add a check to file exists for replacement file?

I think other edit add command is implemented that.

@koba1t
Copy link
Member

koba1t commented Mar 4, 2024

/assign

varshaprasad96
varshaprasad96 approved these changes Mar 4, 2024
View reviewed changes
Copy link
Member

@varshaprasad96 varshaprasad96 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went over the implementation and looks good to me. Lgtm after Yugo's review is addressed.

/hold - Adding hold so that it doesn't auto merge till Yugo's lgtm is in place.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 4, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: charles-chenzz, varshaprasad96

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stormqueen1990 stormqueen1990 stormqueen1990 left review comments

@koba1t koba1t koba1t requested changes

@varshaprasad96 varshaprasad96 varshaprasad96 approved these changes

@annasong20 annasong20 Awaiting requested review from annasong20

@yuwenma yuwenma Awaiting requested review from yuwenma

Assignees

@stormqueen1990 stormqueen1990

@koba1t koba1t

@annasong20 annasong20

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
Kustomize Commands outside of `build`
Status: Needs Approval
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

kustomize edit add replacement
6 participants
@charles-chenzz @annasong20 @k8s-ci-robot @stormqueen1990 @koba1t @varshaprasad96