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

Commits on Feb 3, 2021

  1. Depend on the Kustomize API from fluxcd/pkg 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    02de763 View commit details
    Browse the repository at this point in the history

  2. Add Patches{StrategicMerge,JSON6902} fields to API 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    17a6bff View commit details
    Browse the repository at this point in the history

  3. Use Strategic Merge and JSON 6902 patches 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    7c23acc View commit details
    Browse the repository at this point in the history

  4. Test Strategic Merge and JSON 6902 patches 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Feb 3, 2021
    Configuration menu
    Copy the full SHA
    6e2ac22 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2021

  1. Document Strategic Merge and JSON 6902 overrides 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    65ceea8 View commit details
    Browse the repository at this point in the history

  2. Add link to APIExtensions in generated docs 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    d7cdeb6 View commit details
    Browse the repository at this point in the history