Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

api/resource: retain disableNameSuffixHash on merge and replace #4834

Merged
merged 3 commits into from
Jan 24, 2023
Merged

api/resource: retain disableNameSuffixHash on merge and replace #4834

merged 3 commits into from
Jan 24, 2023

Conversation

elisshafer
Copy link
Contributor

The generator option disableNameSuffixHash being set to true for a given generator which merges or replaces its contents into an imported generator was not being retained.

Handles #4693.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 17, 2022
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Oct 17, 2022 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: elisshafer / name: Eli Shafer (44da033)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Oct 17, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @elisshafer!

It looks like this is your first PR to kubernetes-sigs/kustomize 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kustomize has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @elisshafer. 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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 17, 2022
@elisshafer elisshafer marked this pull request as ready for review October 17, 2022 00:10
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 17, 2022
@k8s-ci-robot k8s-ci-robot requested a review from KnVerey October 17, 2022 00:10
@elisshafer elisshafer changed the title api/resource: retain disableNameSuffixHash on merge. api/resource: retain disableNameSuffixHash on merge Oct 17, 2022
@elisshafer
Copy link
Contributor Author

/assign @KnVerey

@elisshafer elisshafer changed the title api/resource: retain disableNameSuffixHash on merge api/resource: retain disableNameSuffixHash on merge and replace Oct 17, 2022
@natasha41575
Copy link
Contributor

/cc @koba1t

@koba1t could you please review this PR when you get the chance?

@k8s-ci-robot k8s-ci-robot requested a review from koba1t October 21, 2022 21:39
@koba1t
Copy link
Member

koba1t commented Oct 31, 2022

/assign koba1t

koba1t
koba1t requested changes Nov 4, 2022
View reviewed changes
Copy link
Member

@koba1t koba1t left a comment

Choose a reason for hiding this comment

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

Hi, @elisshafer
Thanks for your contribution!!!
Sorry for the delay in reviewing.

Your PR looks so good!
I have a bit comment. Could you check it?

api/krusty/generatormergeandreplace_test.go Show resolved Hide resolved
@koba1t
Copy link
Member

koba1t commented Nov 4, 2022

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 4, 2022
@k8s-ci-robot
Copy link
Contributor

@elisshafer: 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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 5, 2022
@elisshafer elisshafer removed the request for review from KnVerey November 5, 2022 20:25
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 8, 2022
@elisshafer elisshafer force-pushed the generators/retain_disable_suffix_hash branch from 0a0c1cb to c68667e Compare December 8, 2022 06:12
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 8, 2022
@elisshafer elisshafer force-pushed the generators/retain_disable_suffix_hash branch from c68667e to 24bf1d0 Compare December 8, 2022 06:19
@KnVerey KnVerey added this to the v5.0.0 milestone Dec 8, 2022
@elisshafer elisshafer requested review from KnVerey and koba1t and removed request for koba1t, natasha41575 and KnVerey December 13, 2022 00:06
@elisshafer
Copy link
Contributor Author

Hey @KnVerey thanks for the review! This is ready for rereview for the V5 milestone whenever you or other maintainers are ready :)

@elisshafer
Copy link
Contributor Author

/ok-to-test

@elisshafer elisshafer requested review from KnVerey and koba1t and removed request for koba1t and KnVerey January 20, 2023 22:14
@KnVerey
Copy link
Contributor

KnVerey commented Jan 24, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 24, 2023
@k8s-ci-robot k8s-ci-robot merged commit 8f75682 into kubernetes-sigs:master Jan 24, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@koba1t koba1t koba1t requested changes

@KnVerey KnVerey Awaiting requested review from KnVerey

Assignees

@KnVerey KnVerey

@koba1t koba1t

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v5.0.0
Development

Successfully merging this pull request may close these issues.
5 participants
@elisshafer @k8s-ci-robot @natasha41575 @koba1t @KnVerey