Skip to content

Support Strategic Merge and JSON 6902 patches#264

Merged
hiddeco merged 6 commits intomainfrom
kustomize-patches
Feb 4, 2021
Merged

Support Strategic Merge and JSON 6902 patches#264
hiddeco merged 6 commits intomainfrom
kustomize-patches

Conversation

@hiddeco
Copy link
Copy Markdown
Member

@hiddeco hiddeco commented Feb 3, 2021

This PR introduces support for Kustomize Strategic Merge and JSON 6902 patches, it does not offer support for the newer JSON 6902 "superset" patches.

  • Depend on Kustomize API from fluxcd/pkg
  • Add PatchesStrategicMerge and PatchesJSON6902 fields to KustomizationSpec
  • Consume patches in KustomizeGenerator
  • Update spec documentation
  • Include end-to-end tests

@hiddeco hiddeco marked this pull request as draft February 3, 2021 19:04
Signed-off-by: Hidde Beydals <hello@hidde.co>
Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco hiddeco force-pushed the kustomize-patches branch 2 times, most recently from 09dfd80 to cb652f3 Compare February 3, 2021 20:36
@hiddeco hiddeco added area/kustomize Kustomize related issues and pull requests enhancement New feature or request labels Feb 3, 2021
Signed-off-by: Hidde Beydals <hello@hidde.co>
Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco hiddeco requested a review from stefanprodan February 4, 2021 08:23
@hiddeco hiddeco marked this pull request as ready for review February 4, 2021 08:23
Signed-off-by: Hidde Beydals <hello@hidde.co>
Signed-off-by: Hidde Beydals <hello@hidde.co>
Copy link
Copy Markdown
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @hiddeco

@hiddeco hiddeco merged commit 0c3e73f into main Feb 4, 2021
@hiddeco hiddeco deleted the kustomize-patches branch February 4, 2021 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/kustomize Kustomize related issues and pull requests enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants