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.

Sign up for GitHub

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

Jump to bottom

Support Strategic Merge and JSON 6902 patches #264

Merged
merged 6 commits into from
Feb 4, 2021
Merged

Support Strategic Merge and JSON 6902 patches #264

merged 6 commits into from
Feb 4, 2021

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Feb 3, 2021 •
edited
Loading

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
@hiddeco
Depend on the Kustomize API from fluxcd/pkg
02de763 
Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco
Add Patches{StrategicMerge,JSON6902} fields to API
17a6bff 
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
@hiddeco
Use Strategic Merge and JSON 6902 patches
7c23acc 
Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco
Test Strategic Merge and JSON 6902 patches
6e2ac22 
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
@hiddeco
Document Strategic Merge and JSON 6902 overrides
65ceea8 
Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco
Add link to APIExtensions in generated docs
d7cdeb6 
Signed-off-by: Hidde Beydals <hello@hidde.co>
stefanprodan
stefanprodan approved these changes Feb 4, 2021
View reviewed changes
Copy link
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
@stefanprodan stefanprodan mentioned this pull request Feb 10, 2021
Closed
29 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanprodan stefanprodan stefanprodan approved these changes

Assignees
No one assigned
Labels
area/kustomize Kustomize related issues and pull requests enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hiddeco @stefanprodan