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

Use PatchForUpdate in Diff. #604

Merged
merged 3 commits into from
Jun 20, 2019
Merged

Use PatchForUpdate in Diff. #604

merged 3 commits into from
Jun 20, 2019

Commits on Jun 20, 2019

  1. Use PatchForUpdate in Diff. 

    The Kubernetes provider does not currently use a consistent method to
compute the diffs and compute patches for update. The former only
compares old inputs vs. new inputs using a simple JSON diff; the latter
uses either a three-way strategic merge or a three-way JSON merge as
necessary. These changes unify these approaches so that diffs are
computed using the same three-way merge approach used during an update.

In addition to being consistent, this approach also produces more
correct results in the face of drift: if a Kubernetes resource is
modified out-of-band such that a property value is changed or has been
deleted with respect to the desired state, the new approach will detect
that change where it would not have before.
    @pgavlin
    pgavlin committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    b20ba74 View commit details
    Browse the repository at this point in the history

  2. Update the CHANGELOG

    @pgavlin
    pgavlin committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ee2cea3 View commit details
    Browse the repository at this point in the history

  3. Fix an omission

    @pgavlin
    pgavlin committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    c42a42f View commit details
    Browse the repository at this point in the history