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

use patches _correctly_ #4632

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

laverya
Copy link
Member

@laverya laverya commented Jun 20, 2023

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Steps to reproduce

Does this PR introduce a user-facing change?


Does this PR require documentation?

@laverya laverya added type::bug Something isn't working bug::normal labels Jun 20, 2023
@github-actions
Copy link
Contributor

@@ -2,5 +2,5 @@ resources:
- kube-flannel.yml
- troubleshoot.yaml

patches:
patchesStrategicMerge:
Copy link
Contributor

Choose a reason for hiding this comment

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

This won't work with kubernetes >= 1.27.x due to Kustomize v5 removing support for patchesStrategicMerge.
Instead you can do:

patches:
- path: kube-flannel-cfg.patch.yaml

Copy link
Member Author

Choose a reason for hiding this comment

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

hah ok

@github-actions
Copy link
Contributor

@laverya laverya changed the title use patchesStrategicMerge, not patches use patches _correctly_ Jun 22, 2023
@laverya laverya marked this pull request as ready for review June 22, 2023 15:35
@laverya laverya requested a review from a team as a code owner June 22, 2023 15:35
@laverya laverya merged commit 8ee882f into main Jun 22, 2023
@laverya laverya deleted the laverya/sc-78533/weave-to-flannel-migration-patches branch June 22, 2023 17:13
laverya added a commit that referenced this pull request Jun 26, 2023
laverya added a commit that referenced this pull request Jun 26, 2023
* Revert "use patches _correctly_ (#4632)"

This reverts commit 8ee882f.

* keep the test changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug::normal type::bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants