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

chore(deps): upgrade k8s version and client-go #15852

Merged
merged 14 commits into from
Oct 18, 2023
Merged

chore(deps): upgrade k8s version and client-go #15852

merged 14 commits into from
Oct 18, 2023

Commits on Jun 10, 2023

  1. chore(deps): upgrade k8s version and client-go 

    Signed-off-by: fengshunli <1171313930@qq.com>
    @fengshunli
    fengshunli committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    79c983e View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. merge upstream 

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    @crenshaw-dev
    crenshaw-dev committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    f68f62a View commit details
    Browse the repository at this point in the history

  2. merge upstream 

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    @crenshaw-dev
    crenshaw-dev committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    9478476 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. revert bad merge 

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    @crenshaw-dev
    crenshaw-dev committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    d2c6668 View commit details
    Browse the repository at this point in the history

  2. fix codegen 

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    @crenshaw-dev
    crenshaw-dev committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    4aa81c1 View commit details
    Browse the repository at this point in the history

  3. fix codegen 

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    @crenshaw-dev
    crenshaw-dev committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    e0cd79b View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. fix: check for double definition 

    As found in argoproj#13965 (and as a follow-up to argoproj#13999), we also need to
define what happens if _both_ managedNamespaceMetadata _and_ an
Application manifest are both defined for the same namespace.

The idea here is that if that happens, we emit an
`ApplicationConditionRepeatedResourceWarning`, and set the sync status
to `Unknown`, since it's unclear what is supposed to happen.

The user will then have the option of removing one of the two
definitions.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson @crenshaw-dev
    blakepettersson authored and crenshaw-dev committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    19143f8 View commit details
    Browse the repository at this point in the history

  2. fix: check for double definition 

    A simpler fix - don't add a managed namespace to the targetObjs list if
a namespace already exists in the application source.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson @crenshaw-dev
    blakepettersson authored and crenshaw-dev committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    d4eec56 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. chore: merge master 

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson
    blakepettersson committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    792a785 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. build: extra space in doc 

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson
    blakepettersson committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    5f5f5b6 View commit details
    Browse the repository at this point in the history

  2. build: extra space in doc, again 

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson
    blakepettersson committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    3d60a80 View commit details
    Browse the repository at this point in the history

  3. chore: merge master 

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson
    blakepettersson committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    f9bcf31 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. chore: merge master 

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson
    blakepettersson committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    9ca9f06 View commit details
    Browse the repository at this point in the history

  2. chore: bump gitops-engine 

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    @blakepettersson
    blakepettersson committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    aef1ccb View commit details
    Browse the repository at this point in the history