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

Bump kustomize to v5.0.3 used by our current KC deployment and move back to patchesStrategicMerge because of upstream bug + how we render kustomizations locally #68

Merged
merged 3 commits into from
Nov 13, 2023

Conversation

uvegla
Copy link
Contributor

@uvegla uvegla commented Nov 13, 2023

When we render locally or on CI we append vaultless patches to patchesStrategicMerge directly into Flux v2 app GS ksutomization. We have to append there because of upstream bug in kustomize that it cannot handle patch files with multiple documents and Flux still uses such a version.

For provider specific kustomizations it worked fine, because the vaultless patch was applied later. But if they are in the same file, it seems patchesStrategicMerge is applied before patches which renders an incorrect result.

We should keep these - and ones modifying the same resources - in patchesStrategicMerge until Flux bumps to a kustomize version that has the bug fix.

Because of the upstream kustomize bug of applying patche files with multiple
documents + how we locally build kustomizations for development and diff
generation on CI.
@uvegla uvegla changed the title Small fixes to shared makefile Small fixes to shared makefile and bump to kustomize v5.0.3 used by our current KC deployment Nov 13, 2023
@uvegla uvegla changed the title Small fixes to shared makefile and bump to kustomize v5.0.3 used by our current KC deployment Bump kustomize to v5.0.3 used by our current KC deployment and move back to patchesStrategicMerge because of upstream bug + how we render kustomizations locally Nov 13, 2023
@uvegla uvegla marked this pull request as ready for review November 13, 2023 11:55
@uvegla uvegla requested a review from a team as a code owner November 13, 2023 11:55
@uvegla uvegla merged commit 41ba708 into main Nov 13, 2023
@uvegla uvegla deleted the fix-shared-makefile branch November 13, 2023 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant