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

Fix ApplyTask patch behavior #1332

Merged
merged 16 commits into from
Feb 28, 2020
Merged

Fix ApplyTask patch behavior #1332

merged 16 commits into from
Feb 28, 2020

Commits on Feb 4, 2020

  1. Add integration test to verify that containers can be removed 

    Changed task_apply to use update instead of patch

Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    68c9844 View commit details
    Browse the repository at this point in the history

  2. Extended test 

    More testing with strategic merge patches

Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    99dd13f View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. Test for e2e with normal patch 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    46535cf View commit details
    Browse the repository at this point in the history

  2. Allow assertation that a field is NOT present in the returned yaml 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    2934be0 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2020

  1. Fixed integration test 

    Implemented correct three way merge for apply task

Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    619d93d View commit details
    Browse the repository at this point in the history

  2. Small cleanup 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    3af73ca View commit details
    Browse the repository at this point in the history

  3. Allow fallback to three way json merge instead of strategic merge 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    f096dc0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into an/update-instead-of-patch

    @ANeumann82
    ANeumann82 committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    8499582 View commit details
    Browse the repository at this point in the history

  5. Code cleanup 

    Use kudo.dev annotation for lastAppliedConfig

Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    2a399b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2020

  1. Merge branch 'master' into an/update-instead-of-patch

    @ANeumann82
    ANeumann82 committed Feb 10, 2020
    Configuration menu
    Copy the full SHA
    927d11c View commit details
    Browse the repository at this point in the history

  2. Use test harness errors instead adding feature in assert.yaml 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 10, 2020
    Configuration menu
    Copy the full SHA
    ef48949 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Merge branch 'master' into an/update-instead-of-patch 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>

# Conflicts:
#	pkg/engine/task/task_apply.go
    @ANeumann82
    ANeumann82 committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    5e43e65 View commit details
    Browse the repository at this point in the history

  2. Small cleanup 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    7db191b View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. Merge branch 'master' into an/update-instead-of-patch

    @ANeumann82
    ANeumann82 committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    5d7a917 View commit details
    Browse the repository at this point in the history

  2. Applied code review comments 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    12b746d View commit details
    Browse the repository at this point in the history

  3. Bail out loud if an error occurs while patching 

    Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
    @ANeumann82
    ANeumann82 committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    6d57b53 View commit details
    Browse the repository at this point in the history