Skip to content

✨ Use kustomize new syntax for patches #1735

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

Merged

Conversation

mquhuy
Copy link
Contributor

@mquhuy mquhuy commented Oct 26, 2023

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 #1730

Special notes for your reviewer:
Kustomize version needs to be updated to 5.2.1, as the current version (5.1.1) gets confused with multiple objects in the same patch file (it only understands if the patch file is split so that each object is in one file).

I also updated the kustomize version in ensure_kustomize.sh. Not sure if it's in use though, as I can see that the version is already very old.

@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 Oct 26, 2023
@netlify
Copy link

netlify bot commented Oct 26, 2023

Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name Link
🔨 Latest commit 83f22d4
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/653b5e88e48ff90008e0e820
😎 Deploy Preview https://deploy-preview-1735--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 26, 2023
@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 Oct 26, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @mquhuy. 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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 26, 2023
@mquhuy mquhuy force-pushed the mquhuy/fix-kustomize-syntax branch from b8fa601 to 7bab061 Compare October 27, 2023 05:51
@lentzi90
Copy link
Contributor

/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 Oct 27, 2023
@mquhuy mquhuy force-pushed the mquhuy/fix-kustomize-syntax branch from 7bab061 to f178f68 Compare October 27, 2023 06:04
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 27, 2023
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.

Looks good! Could you move the apiVersion and kind to the top of the files?

@mquhuy mquhuy force-pushed the mquhuy/fix-kustomize-syntax branch from f178f68 to 5ff0bf8 Compare October 27, 2023 06:34
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!
I think we can also update the same in v1alpha6, v1alpha5 and here. Then I think we got rid of all the old syntax 🙂

@mquhuy mquhuy force-pushed the mquhuy/fix-kustomize-syntax branch from 5ff0bf8 to 83f22d4 Compare October 27, 2023 06:53
@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 Oct 27, 2023
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.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lentzi90, mquhuy

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 Oct 27, 2023
@lentzi90
Copy link
Contributor

Triggering full e2e since this touches the remediation tests
/test pull-cluster-api-provider-openstack-e2e-full-test

@lentzi90
Copy link
Contributor

It is unclear to me if the test failure is related to the PR
/test pull-cluster-api-provider-openstack-e2e-test

@mdbooth
Copy link
Contributor

mdbooth commented Oct 27, 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 Oct 27, 2023
@mquhuy
Copy link
Contributor Author

mquhuy commented Oct 27, 2023

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 27, 2023
@k8s-ci-robot k8s-ci-robot merged commit 292abc1 into kubernetes-sigs:main Oct 27, 2023
@lentzi90 lentzi90 deleted the mquhuy/fix-kustomize-syntax branch April 17, 2025 11:47
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. 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
Development

Successfully merging this pull request may close these issues.

templates: 'patchesStrategicMerge' is deprecated
4 participants