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.

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

🌱 Update Kustomize deprecated syntax #10294

Conversation

peppi-lotta
Copy link
Contributor

  • patchesStrategicMerge -> patches
  • patchesJson6902 -> patches
  • vars and varReference -> replacements
  • bases -> resources

Continuing on where this PR was left off.

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Copy link

linux-foundation-easycla bot commented Mar 20, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: peppi-lotta / name: Peppi-Lotta (1e56348)

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label labels Mar 20, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @peppi-lotta!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. 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/cluster-api 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 @peppi-lotta. 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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 20, 2024
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ 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 Mar 20, 2024
@peppi-lotta peppi-lotta changed the title 🌱 Update Kustomize depricated syntax 🌱 Update Kustomize deprecated syntax Mar 20, 2024
@peppi-lotta
Copy link
Contributor Author

Copy link
Contributor

@kranurag7 kranurag7 left a comment

Choose a reason for hiding this comment

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

Thank you for the patch. I don't get warnings anymore when using kustomize build
Can you please also update the kustomize version (binary and pkg) in Makefile.

cluster-api/Makefile

Lines 106 to 109 in af5f2c9

KUSTOMIZE_VER := v4.5.2
KUSTOMIZE_BIN := kustomize
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4

@peppi-lotta peppi-lotta force-pushed the peppi-lotta/Kustomize-depricated-syntax branch 2 times, most recently from 7ff32a2 to 6361bdd Compare March 20, 2024 12:34
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/ok-to-test

/area dependency

Thanks for working on this! It must have been a frustrating one!

@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. area/dependency Issues or PRs related to dependency changes and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/needs-area PR is missing an area label labels Mar 21, 2024
@peppi-lotta
Copy link
Contributor Author

It seem all other tests have passed but golangci-lint test are still running after 20 hours. They should probably be stopped and re-triggered.

@killianmuldoon killianmuldoon changed the title 🌱 Update Kustomize deprecated syntax 🌱 Update Kustomize deprecated syntax Mar 22, 2024
@killianmuldoon
Copy link
Contributor

I retriggered the tests - I'm assuming it was some github actions quirk.

Copy link
Contributor

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

Great job!

I have just one little concern that I think would be quite easy to address. See the comment below.

@peppi-lotta peppi-lotta force-pushed the peppi-lotta/Kustomize-depricated-syntax branch from 6361bdd to d05d742 Compare April 2, 2024 11:29
- patchesStrategicMerge -> patches
- patchesJson6902 -> patches
- vars and varReference -> replacements
- bases -> resources

and bump version

Signed-off-by: Peppi-Lotta <[email protected]>
@peppi-lotta peppi-lotta force-pushed the peppi-lotta/Kustomize-depricated-syntax branch from d05d742 to 1e56348 Compare April 2, 2024 11:36
@peppi-lotta
Copy link
Contributor Author

@elmiko and @jackfrancis Please review this as soon as you have time for it.

Copy link
Contributor

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

Great!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 3, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: a19fd89141d54c13f1a0cae7218278d2dbc993c0

@sbueringer
Copy link
Member

@chrischdi PTAL :)

Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

i'm no kustomize expert but this generally makes sense to me
/lgtm

Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

No delta on the output files 🎉

/approve

Thanks for working on this!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Apr 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit 0ec67bd into kubernetes-sigs:main Apr 8, 2024
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Apr 8, 2024
@sbueringer
Copy link
Member

Thank you very much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants