mirror of
https://github.com/argoproj/argo-cd
synced 2026-05-24 09:50:08 +00:00
9e0e8d5e8a
* chore(deps): upgrade k8s version and client-go Signed-off-by: fengshunli <1171313930@qq.com> * revert bad merge Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix codegen Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix codegen Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix: check for double definition As found in #13965 (and as a follow-up to #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> * 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> * build: extra space in doc Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * build: extra space in doc, again Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * chore: bump gitops-engine Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: fengshunli <1171313930@qq.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: fengshunli <1171313930@qq.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| dev-mounter | ||
| gen-catalog | ||
| gen-crd-spec | ||
| gen-docs | ||
| gen-resources | ||
| installers | ||
| k8s | ||
| known_types | ||
| .dockerignore | ||
| boilerplate.go.txt | ||
| custom-boilerplate.go.txt | ||
| Dockerfile.dev-tools | ||
| generate-proto.sh | ||
| generate-release-notes.sh | ||
| git-ask-pass.sh | ||
| git-verify-wrapper.sh | ||
| goreman-start.sh | ||
| gpg-wrapper.sh | ||
| install.sh | ||
| snyk-container-tests.sh | ||
| snyk-non-container-tests.sh | ||
| snyk-report.sh | ||
| ssh_known_hosts | ||
| test.sh | ||
| tool-versions.sh | ||
| tools.go | ||
| trigger-release.sh | ||
| update-codegen.sh | ||
| update-manifests.sh | ||
| update-openapi.sh | ||
| update-ssh-known-hosts.sh | ||
| update-supported-versions.sh | ||