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 for server side apply #392

Open
wants to merge 49 commits into
base: develop
Choose a base branch
from
Open

Support for server side apply #392

wants to merge 49 commits into from

Commits on Dec 10, 2021

  1. Adds e2e test for simple server side apply merge case

    @redbaron
    redbaron committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    fd0f790 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Embeddable E2E tests

    @redbaron
    redbaron committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    176ebb5 View commit details
    Browse the repository at this point in the history

  2. First basic SSA support

    @redbaron
    redbaron committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    20bd0a6 View commit details
    Browse the repository at this point in the history

  3. Fix tests compilation

    @redbaron
    redbaron committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    27e77f8 View commit details
    Browse the repository at this point in the history

  4. Make linter happy

    @redbaron
    redbaron committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    6884b1e View commit details
    Browse the repository at this point in the history

  5. Fix diffing logic so that it never diffs managed fields

    @redbaron
    redbaron committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    7de82bd View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Cosmetic changes to address feedback

    @redbaron
    redbaron committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    1f77748 View commit details
    Browse the repository at this point in the history

  2. Remove unused field

    @redbaron
    redbaron committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    5ff0cd5 View commit details
    Browse the repository at this point in the history

  3. Don't strip history in ChangeFactory.NewChangeSSA because it won't sh… 

    …ow up in the diff anyway
    @redbaron
    redbaron committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    a1b7202 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Another fix for NewChangeAgainstLastApplied to prevent history showin… 

    …g up in diff
    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    e7b4682 View commit details
    Browse the repository at this point in the history

  2. Move dryRun to PatchOpts struct

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    d17a09e View commit details
    Browse the repository at this point in the history

  3. Make RunEmbedded to fail tests on error

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    868d362 View commit details
    Browse the repository at this point in the history

  4. Adjust tests to reflect that history is not passed to rebasing rules

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    6a42593 View commit details
    Browse the repository at this point in the history

  5. Add SSA support for diff command. Check CLI flags for conflicts

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    3c0ba71 View commit details
    Browse the repository at this point in the history

  6. Add copyright and license header

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    1e81fce View commit details
    Browse the repository at this point in the history

  7. Run all e2e tests as kapp subprocess. Remove unnecessary error check.

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    df4a333 View commit details
    Browse the repository at this point in the history

  8. Fix diff generation for versioned renamed objects

    @redbaron
    redbaron committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    307bbe9 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Support enabling SSA for E2E tests via env var globally

    @redbaron
    redbaron committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    8eb9d07 View commit details
    Browse the repository at this point in the history

  2. Fix panic in delete

    @redbaron
    redbaron committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    c11badb View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. When SSA enabled, dry run object creation to get most accurate diff

    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    5a5d997 View commit details
    Browse the repository at this point in the history

  2. Enable SSA during tests only if KAPPP_E2E_SSA is set to 1

    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    5b6b056 View commit details
    Browse the repository at this point in the history

  3. Make IdentifierResources.Patch method to return Resource with strippe… 

    …d identity annotation

Other methods, like Create and Update, are stripping annotations,
this change makes Patch consistent with the rest.

Other methods force identity annotation to be set on all resources sent to K8S API.
Technically Patch should do the same with patch data, but it is tricky as there are multiple
patch formats supported by K8S and analysing and amending them to force identity annotation
to be present doesn't worth the effort.
    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    d2a434b View commit details
    Browse the repository at this point in the history

  4. Persist history using Patch instead of Update call. 

    This makes it unnecessary to have retry logic as no patch errors are retriable
    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    7745d81 View commit details
    Browse the repository at this point in the history

  5. FIXME: Temporarily remove Create dry run, because it wasn't dry run a… 

    …t all
    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    9a6b41f View commit details
    Browse the repository at this point in the history

  6. Fixme IdentifierResources.Patch method

    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    8488060 View commit details
    Browse the repository at this point in the history

  7. Fixme Persist history using Patch

    @redbaron
    redbaron committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    de9dca5 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. Add support for SSA to 'Add*' strategies

    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    a135136 View commit details
    Browse the repository at this point in the history

  2. Clear history when creating SSA change

    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    f203cec View commit details
    Browse the repository at this point in the history

  3. Drop ChangeSSA as it becomes exactly like ChangeImpl. Use latter inst… 

    …ead.
    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    977df6f View commit details
    Browse the repository at this point in the history

  4. env.Namespace some of the tests

    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    c97d804 View commit details
    Browse the repository at this point in the history

  5. Skip diff comparison in template test. 

    SSA legitimately generates different diff
    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    e8bcfcb View commit details
    Browse the repository at this point in the history

  6. Carry on generating SSA change even if attempting to make an invalid … 

    …update

Invalid updates will either be retried as replace, in which case generated diff is accurate
or it will be failed at the later stage after change graph is generated
    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    1033a23 View commit details
    Browse the repository at this point in the history

  7. env.Namespace more tests

    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    632638e View commit details
    Browse the repository at this point in the history

  8. Skip conflict rebasing test in SSA mode

    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    6af080b View commit details
    Browse the repository at this point in the history

  9. env.Namespace more tests

    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    c01292c View commit details
    Browse the repository at this point in the history

  10. Use JSON merge patch when recording history 

    Strategic merge patch is not support for CRDs without schema
    @redbaron
    redbaron committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    c6d868e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Add SSASkip and comments

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    527553b View commit details
    Browse the repository at this point in the history

  2. Run E2E tests in SSA and non-SSA mode

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    c98601d View commit details
    Browse the repository at this point in the history

  3. Fix nil panic in tests

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    4301a35 View commit details
    Browse the repository at this point in the history

  4. Remove RunEmbedded leftovers in e2e tests

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    2c4cb43 View commit details
    Browse the repository at this point in the history

  5. Use FieldManagerName from CLI args in the AddPlainStrategy

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    6fd31bd View commit details
    Browse the repository at this point in the history

  6. Add support for ssa-force flag

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    c9be433 View commit details
    Browse the repository at this point in the history

  7. Make linter happy

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    8a952e0 View commit details
    Browse the repository at this point in the history

  8. Remove unused file

    @redbaron
    redbaron committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    3a9a9fc View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. Smallest nits

    @redbaron
    redbaron committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    389316e View commit details
    Browse the repository at this point in the history

  2. Localize force param value calculation 

    Also rename SSAFlags struct fields
    @redbaron
    redbaron committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    96fb26c View commit details
    Browse the repository at this point in the history

  3. Duplicate SSAFlags in SSAOpts and move them back to cmd/tools

    @redbaron
    redbaron committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    9795527 View commit details
    Browse the repository at this point in the history

  4. Remove dead code

    @redbaron
    redbaron committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    f94e5b3 View commit details
    Browse the repository at this point in the history

  5. Don't try to resolve update conflict when using SSA

    @redbaron
    redbaron committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    9c5d0ea View commit details
    Browse the repository at this point in the history