fix(controller): make managed namespaces more 'prune-proof' by blakepettersson · Pull Request #13999 · argoproj/argo-cd

blakepettersson · 2023-06-12T09:54:47Z

In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using managedNamespaceMetadata, we need to take steps to ensure that the namespace does not get pruned.

In order to do that, we add the live namespace to the list of targetObjs (so that it's considered a part of the source even though it's not).

Finally, we need to also ensure that the managed namespace is not considered OutOfSync (due to the same reason as above).

This is a subset of #11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so.

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

Please see Contribution FAQs if you have questions about your pull-request.

In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of argoproj#11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

controller/state.go

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

codecov · 2023-06-13T17:36:06Z

Codecov Report

Patch coverage: 60.00% and project coverage change: +0.09 🎉

Comparison is base (ec2340a) 49.48% compared to head (4c0db4a) 49.58%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #13999      +/-   ##
==========================================
+ Coverage   49.48%   49.58%   +0.09%     
==========================================
  Files         256      256              
  Lines       43847    43939      +92     
==========================================
+ Hits        21697    21786      +89     
- Misses      19988    19989       +1     
- Partials     2162     2164       +2

Impacted Files	Coverage Δ
controller/state.go	`67.67% <60.00%> (-0.31%)`	⬇️

... and 7 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

blakepettersson · 2023-09-13T16:04:20Z

Thanks @jannfis! 🤗

jannfis · 2023-09-13T16:12:08Z

/cherry-pick release-2.8

* fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of #11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

…15488) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of #11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. * refactor: extract managed namespace check --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>

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>

…#13999) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of argoproj#11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Signed-off-by: Jimmy Neville <jimmyeneville@gmail.com>

* 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>

* 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 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> * 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>

* 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> * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.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. * 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. * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>

…#13999) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of argoproj#11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>

* 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 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> * 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> Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>

* 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> * 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> * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>

* backfill cache control header tests for ui assets Signed-off-by: Scott Windsor <scott.windsor@flexe.com> * Set cache-control header non-cache for assets not found Signed-off-by: Scott Windsor <scott.windsor@flexe.com> * fix golang-cilint warning Signed-off-by: Scott Windsor <scott.windsor@flexe.com> --------- Signed-off-by: Scott Windsor <scott.windsor@flexe.com> docs: Fixes a markdown typo in USERS.md (#15362) This removes the whitespace between the link text and the link URL. Signed-off-by: Prasad Katti <prasad.katti@segment.com> feat: upgrade notification engine (#15359) * Update notifications-engine dependencies Signed-off-by: Mike Splain <mike.splain@gmail.com> * Update docs Signed-off-by: Mike Splain <mike.splain@gmail.com> --------- Signed-off-by: Mike Splain <mike.splain@gmail.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> feat: add Dott to users (#15370) Signed-off-by: Jake Burn <jake@ridedott.com> fix(notifications-catalog): Add nil check for on-deployed trigger (#15363) Signed-off-by: Fs02 <surya.asriadie@gmail.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> feat: auto respect rbac for discovery/sync (#14381) feat: auto respect rbac for discovery/sync (#14381) Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> feat: Add ARGOCD_CLUSTER_CACHE_LIST_PAGE_BUFFER_SIZE environment variable (#15159) Signed-off-by: Brad West <brad.g.west@gmail.com> fix(appset): Revert applicationset-name labels (#15324) * fix(15282) Revert applicationset-name labels Signed-off-by: gmuselli <geoffrey.muselli@gmail.com> * fix(15282) fix unit test Signed-off-by: gmuselli <geoffrey.muselli@gmail.com> --------- Signed-off-by: gmuselli <geoffrey.muselli@gmail.com> chore(deps): bump library/golang from 1.21.0 to 1.21.1 (#15391) Bumps library/golang from 1.21.0 to 1.21.1. --- updated-dependencies: - dependency-name: library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/golang from 1.21.0 to 1.21.1 in /test/remote (#15387) Bumps library/golang from 1.21.0 to 1.21.1. --- updated-dependencies: - dependency-name: library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/node from 20.4.0 to 20.6.0 in /test/container (#15366) Bumps library/node from 20.4.0 to 20.6.0. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Merge pull request from GHSA-g687-f2gx-6wm8 * feat: use untar with limiter Signed-off-by: pashakostohrys <pavel@codefresh.io> * feat: use untar with limiter Signed-off-by: pashakostohrys <pavel@codefresh.io> --------- Signed-off-by: pashakostohrys <pavel@codefresh.io> Merge pull request from GHSA-fwr2-64vr-xv9m * fix: prevent seeing/editing 'kubectl.kubernetes.io/last-applied-configuration' cluster annotation Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> * fix: failing unit test Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com> --------- Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com> Co-authored-by: iam-veeramalla <abhishek.veeramalla@gmail.com> chore(deps): bump library/node from 20.5.0 to 20.6.0 in /ui-test (#15364) Bumps library/node from 20.5.0 to 20.6.0. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> fix: handle annotations for resources with ':' in the name (#15101) (#15380) * fix: handle annotations for resources with ':' in the name Signed-off-by: Oreon Lothamer <oreon.lothamer@softrams.com> * fix: switch to using splitN for handling annotation splitting Signed-off-by: Oreon Lothamer <oreon.lothamer@softrams.com> * fix: check len(parts) !=3 Signed-off-by: Oreon Lothamer <oreon.lothamer@softrams.com> * Retrigger CI pipeline Signed-off-by: Oreon Lothamer <oreon.lothamer@softrams.com> --------- Signed-off-by: Oreon Lothamer <oreon.lothamer@softrams.com> docs: Improve RBAC documentation (#15430) * Improve staging-db project name This change renames the project to distinguish it from the role. Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Rename db-staging role to singular form Role names should be singular ("User x has the role admin" as opposed to "User x has the role admins"). Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Remove trailing newlines Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Consistently mark `AppProject` as code Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Replace ```shell with ```console in suitable places Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Use consistent style for unordered list https://github.com/DavidAnson/markdownlint/blob/main/doc/md004.md Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Use consistent emphasis style https://github.com/DavidAnson/markdownlint/blob/main/doc/md049.md Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Fix incorrect description of the staging-db example Signed-off-by: Andreas Lindhé <andreas@lindhe.io> --------- Signed-off-by: Andreas Lindhé <andreas@lindhe.io> fix(appsets): gotemplate can cause panic from nil dereference (#15377) (#15378) * fix(appsets): gotemplate can cause panic from nil deference Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com> * fix(appsets): gotemplate can cause panic from nil dereference Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com> --------- Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com> chore: Fix flaky cluster test (#15433) Fix requeue after for Matrix/Merge with SCM or ClusterDecision generators (#15407) Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com> feat: added shorthand flags for follow and conatainre in app logs (#15400) * feat: added shorthand flags for follow and conatainre in app logs Signed-off-by: ashu <ashupednekar49@gmail.com> * doc: re-generated cli docs Signed-off-by: ashu <ashupednekar49@gmail.com> --------- Signed-off-by: ashu <ashupednekar49@gmail.com> Co-authored-by: jannfis <jann@mistrust.net> [Bot] docs: Update Snyk reports (#15437) Signed-off-by: CI <ci@argoproj.com> Co-authored-by: CI <ci@argoproj.com> Co-authored-by: jannfis <jann@mistrust.net> fix: Better enforcement of application namespace restrictions (#15431) * fix: Better enforce application namespace restrictions Signed-off-by: jannfis <jann@mistrust.net> * Only call ValidateDestination when allowed Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> docs: fix bullets (#15446) Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> fix: failed to add cluster when the cluster server address is ipv6 (#8204) (#15350) * fix: failed to add cluster when the cluster server address is ipv6 (#8204) Signed-off-by: huyinhou <huyinhou@bytedance.com> * fix: failed to add cluster when the cluster server address is ipv6 (#8204) Signed-off-by: huyinhou <huyinhou@bytedance.com> * remove unused import Signed-off-by: huyinhou <huyinhou@bytedance.com> * fix: lowercase URI secret name; abbreviated IPv6 address Signed-off-by: huyinhou <huyinhou@bytedance.com> --------- Signed-off-by: huyinhou <huyinhou@bytedance.com> feat: Enable haproxy metrics through helm Chart (#15459) Signed-off-by: Mathias Petermann <mathias.petermann@swisscom.com> Stop appending :443 to the server address when using grpc-web (#15435) Signed-off-by: David Marby <david@dmarby.se> Co-authored-by: jannfis <jann@mistrust.net> feat: appset preserve labels and global preserve fields (#15445) * feat: appset preserve labels and global preserve fields Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> * feat: appset preserve labels and global preserve fields Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> * docs: updated docs Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> * docs: updated docs Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> --------- Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> fix: Gitlab scm_provider - don't create transport from scratch (#15424) (#15425) * fix : don't create transport from scratch, clone it instead Signed-off-by: Antoine Jouve <ant.jouve@gmail.com> * feat: clone http.transport for gitea and gitlab providers Signed-off-by: Antoine Jouve <ant.jouve@gmail.com> * chore: properly format gitea providers with gofmt Signed-off-by: Antoine Jouve <ant.jouve@gmail.com> --------- Signed-off-by: Antoine Jouve <ant.jouve@gmail.com> chore: add Factorial to USERS.md (#15473) Signed-off-by: Alejandro López Sánchez <alejandro.lopez@factorial.co> Fix incorrect wording in ApplicationSet git generator docs (#15374) Signed-off-by: Liam Wyllie <risset@mailbox.org> fix: Allow retrieving badges in other namespaces (#15468) Signed-off-by: jannfis <jann@mistrust.net> chore(deps): bump docker/setup-buildx-action from 2.9.1 to 3.0.0 (#15476) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.9.1 to 3.0.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/4c0219f9ac95b02789c1075625400b2acbff50b1...f95db51fddba0c2d1ec667646a06c2ce06100226) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/node from 20.6.0 to 20.6.1 in /test/container (#15451) Bumps library/node from 20.6.0 to 20.6.1. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/node from 20.6.0 to 20.6.1 in /ui-test (#15452) Bumps library/node from 20.6.0 to 20.6.1. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump gitpod/workspace-full from `d578722` to `511cecd` (#15453) Bumps gitpod/workspace-full from `d578722` to `511cecd`. --- updated-dependencies: - dependency-name: gitpod/workspace-full dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump argo-ui from `13cea62` to `002d01b` in /ui (#15440) Bumps [argo-ui](https://github.com/argoproj/argo-ui) from `13cea62` to `002d01b`. - [Release notes](https://github.com/argoproj/argo-ui/releases) - [Commits](https://github.com/argoproj/argo-ui/compare/13cea62a4a0e4a14a2dd6908490e1e907709aa86...002d01b18e8aaf4b21307a3b87341ab05230483f) --- updated-dependencies: - dependency-name: argo-ui dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/golang in /test/remote (#15419) Bumps library/golang from `970907c` to `62e5883`. --- updated-dependencies: - dependency-name: library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/golang from `970907c` to `62e5883` (#15415) Bumps library/golang from `970907c` to `62e5883`. --- updated-dependencies: - dependency-name: library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> fix(controller): make managed namespaces more 'prune-proof' (#13999) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of #11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> fix: extends CR to allow cronjob/workflow triggers (#15300) Signed-off-by: Marcelo Moreira de Mello <tchello.mello@gmail.com> Co-authored-by: Nicholas Morey <nicholas@morey.tech> chore(deps): bump library/node from 20.5.0 to 20.6.1 (#15454) Bumps library/node from 20.5.0 to 20.6.1. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jannfis <jann@mistrust.net> chore(deps): bump github.com/cyphar/filepath-securejoin (#15401) Bumps [github.com/cyphar/filepath-securejoin](https://github.com/cyphar/filepath-securejoin) from 0.2.3 to 0.2.4. - [Release notes](https://github.com/cyphar/filepath-securejoin/releases) - [Commits](https://github.com/cyphar/filepath-securejoin/compare/v0.2.3...v0.2.4) --- updated-dependencies: - dependency-name: github.com/cyphar/filepath-securejoin dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (docs) Add clarification on migration for CMP plugins (#15405) * Add clarification on migration for CMP plugins Signed-off-by: Dan Garfield <dan@codefresh.io> * Fix table Signed-off-by: Dan Garfield <dan@codefresh.io> * Add warning on blank manifests for #15340 Signed-off-by: Dan Garfield <dan@codefresh.io> --------- Signed-off-by: Dan Garfield <dan@codefresh.io> chore(deps): bump sigstore/cosign-installer from 3.1.1 to 3.1.2 (#15330) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/6e04d228eb30da1757ee4e1dd75a0ec73a653e06...11086d25041f77fe8fe7b9ea4e48e3b9192b8f19) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump github.com/xanzy/go-gitlab from 0.89.0 to 0.91.1 (#15331) Bumps [github.com/xanzy/go-gitlab](https://github.com/xanzy/go-gitlab) from 0.89.0 to 0.91.1. - [Changelog](https://github.com/xanzy/go-gitlab/blob/master/releases_test.go) - [Commits](https://github.com/xanzy/go-gitlab/compare/v0.89.0...v0.91.1) --- updated-dependencies: - dependency-name: github.com/xanzy/go-gitlab dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> docs: Add KPMG to users (#15323) Signed-off-by: Ansuman Swain <ansuman.swain@kpmg.co.uk> Co-authored-by: jannfis <jann@mistrust.net> Fix broken links for post selectors, fix ordering of args for dig example (#15346) Signed-off-by: David Muckle <dvdmuckle@dvdmuckle.xyz> chore(deps): bump library/golang in /test/container (#15502) Bumps library/golang from 1.21.0 to 1.21.1. --- updated-dependencies: - dependency-name: library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump github.com/casbin/casbin/v2 from 2.73.0 to 2.77.2 (#15501) Bumps [github.com/casbin/casbin/v2](https://github.com/casbin/casbin) from 2.73.0 to 2.77.2. - [Release notes](https://github.com/casbin/casbin/releases) - [Changelog](https://github.com/casbin/casbin/blob/master/.releaserc.json) - [Commits](https://github.com/casbin/casbin/compare/v2.73.0...v2.77.2) --- updated-dependencies: - dependency-name: github.com/casbin/casbin/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump actions/upload-artifact from 3.1.2 to 3.1.3 (#15497) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/0b7f8abb1508181956e8e162db84b466c27e18ce...a8a3f3ad30e3422c9c7b888a15615d19a852ae32) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jannfis <jann@mistrust.net> fix(cli): fix header in resource-overrides list-actions output (#15375) Signed-off-by: Maxime Brunet <max@brnt.mx> chore: adding tests for apiclient package: clientset tests (#15193) Signed-off-by: zhaque44 <haque.zubair@gmail.com> fix: Applicationset upsert for any namespaces (#15520) * fix: Applicationset upsert for any namespaces PR implements a small change to the argocd command adding the AppsetNamespace for the existing Appset check. Signed-off-by: Harm Matthias Harms <matthias.harms@quis.de> * Retrigger CI pipeline Signed-off-by: Harm Matthias Harms <matthias.harms@quis.de> * Retrigger CI pipeline Signed-off-by: Harm Matthias Harms <matthias.harms@quis.de> --------- Signed-off-by: Harm Matthias Harms <matthias.harms@quis.de> chore: update ordering of support steps (#15508) Signed-off-by: Kurt King <kurtaking@gmail.com> feat: add option in output flag for app get and app resources cli command for tree view(#13370) (#15386) * tree view feature for app get cli comand Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * including application details Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * testcase included for printTreeView Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * removed the unnecessary variables Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * Adding changes to the documentation Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * change in the argocd doc Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * included tee_test.go Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * tree view changes for app get and app resources Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * go.mod and go.sum by running go mod tidy Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * changes after review Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * changes after review Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> --------- Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> chore(deps): bump github.com/go-playground/webhooks/v6 (#15516) Bumps [github.com/go-playground/webhooks/v6](https://github.com/go-playground/webhooks) from 6.2.1-0.20230808162451-10570b0a59e8 to 6.3.0. - [Release notes](https://github.com/go-playground/webhooks/releases) - [Commits](https://github.com/go-playground/webhooks/commits/v6.3.0) --- updated-dependencies: - dependency-name: github.com/go-playground/webhooks/v6 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> fix: ApplicationSet deletes Application status (#15514) * fix: ApplicationSet deletes Application status Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> * apply reviewer notes Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> --------- Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> docs: Update Application Set Webhook Instructions (#13764, #11532) (#15527) * Update Generators-Pull-Request.md Add note to clarify that the ApplicationSet controller requires its own Ingress resource. This seems to be a common issue for Argo CD users. Signed-off-by: Kurt Madel <km@kurtmadel.com> * Update Generators-Git.md Updating note to match webhook note on pr generator. Signed-off-by: Kurt Madel <km@kurtmadel.com> --------- Signed-off-by: Kurt Madel <km@kurtmadel.com> chore: Add 4data to users (#15531) Signed-off-by: LStuker <lucien.stuker@4data.ch> docs: fix kubectl apply in apps-in-any-namespace doc (#15197) There's a kustomization.yaml file in that directory, so we should apply it with `-k`. Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> docs: Fix docs for destinations in AppProjects (#15153) (#15182) Signed-off-by: Andreas Lindhé <andreas@lindhe.io> chore(deps): bump github.com/ktrysmt/go-bitbucket from 0.9.63 to 0.9.67 (#15500) Bumps [github.com/ktrysmt/go-bitbucket](https://github.com/ktrysmt/go-bitbucket) from 0.9.63 to 0.9.67. - [Release notes](https://github.com/ktrysmt/go-bitbucket/releases) - [Commits](https://github.com/ktrysmt/go-bitbucket/compare/v0.9.63...v0.9.67) --- updated-dependencies: - dependency-name: github.com/ktrysmt/go-bitbucket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jannfis <jann@mistrust.net> chore(deps): bump goreleaser/goreleaser-action from 4.4.0 to 5.0.0 (#15496) Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 4.4.0 to 5.0.0. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/3fa32b8bb5620a2c1afe798654bbad59f9da4906...7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> [Bot] docs: Update Snyk reports (#15532) Signed-off-by: CI <ci@argoproj.com> Co-authored-by: CI <ci@argoproj.com> chore(deps): bump actions/checkout from 3.5.3 to 4.0.0 (#15348) * chore(deps): bump actions/checkout from 3.5.3 to 4.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/c85c95e3d7251135ab7dc9ce3241c5835cc595a9...3df4ab11eba7bda6032a0b82a6bb43b11571feac) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Apply suggestions from code review Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> feat(ui): Add button for wrapping lines in pod logs viewer (#15506) * Add back wrap log line button Signed-off-by: Yi Cai <yicai@redhat.com> * Fixed lint issue Signed-off-by: Yi Cai <yicai@redhat.com> * Updated icon and location of Wrap Lines btn Signed-off-by: Yi Cai <yicai@redhat.com> * Fixed lint issue Signed-off-by: Yi Cai <yicai@redhat.com> * Put back pre tag and Ansi component Signed-off-by: Yi Cai <yicai@redhat.com> --------- Signed-off-by: Yi Cai <yicai@redhat.com> chore: add CODEOWNERS (#14693) * chore: add CODEOWNERS Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * new owners Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * use teams Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * restore old owners file Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix: reflect expected integers in swagger doc (#13046) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> chore(deps): bump oras.land/oras-go/v2 from 2.2.1 to 2.3.0 (#15549) Bumps [oras.land/oras-go/v2](https://github.com/oras-project/oras-go) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/oras-project/oras-go/releases) - [Commits](https://github.com/oras-project/oras-go/compare/v2.2.1...v2.3.0) --- updated-dependencies: - dependency-name: oras.land/oras-go/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump github.com/antonmedv/expr from 1.12.7 to 1.15.2 (#15548) Bumps [github.com/antonmedv/expr](https://github.com/antonmedv/expr) from 1.12.7 to 1.15.2. - [Release notes](https://github.com/antonmedv/expr/releases) - [Commits](https://github.com/antonmedv/expr/compare/v1.12.7...v1.15.2) --- updated-dependencies: - dependency-name: github.com/antonmedv/expr dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> fix(repo-server): avoid fetching commit sha for multisource applications (#15037) (#15067) * Rebase Signed-off-by: ozlevka-work <lev@ozeryansky.com> Signed-off-by: Lev <lozeryan@akami.com> * Remove test file Signed-off-by: ozlevka-work <lev@ozeryansky.com> Signed-off-by: Lev <lozeryan@akami.com> * Go linter fmt Signed-off-by: ozlevka-work <lev@ozeryansky.com> Signed-off-by: Lev <lozeryan@akami.com> * Additional linter fmt Signed-off-by: ozlevka-work <lev@ozeryansky.com> Signed-off-by: Lev <lozeryan@akami.com> Signed-off-by: Lev <lev@ozeryansky.com> * Add unit test for changes Signed-off-by: Lev <lozeryan@akami.com> Signed-off-by: Lev <lev@ozeryansky.com> * Update reposerver/repository/repository.go Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Lev Ozeryansky <lozeryan@akamai.com> Signed-off-by: Lev <lev@ozeryansky.com> * Trigger CI Signed-off-by: Lev <lev@ozeryansky.com> --------- Signed-off-by: Lev <lozeryan@akami.com> Signed-off-by: Lev <lev@ozeryansky.com> Signed-off-by: Lev Ozeryansky <lozeryan@akamai.com> Co-authored-by: Lev <lozeryan@akami.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> doc: adds vals-operator to secrets list (#11795) Vals-Operator can also be used for managing secrets in Kubernetes. Signed-off-by: Sergio Rua <58211930+digiserg@users.noreply.github.com> chore(deps): bump actions/cache from 3.3.1 to 3.3.2 (#15552) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8...704facf57e6136b1bc63b828d79edcd491f0ee84) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jannfis <jann@mistrust.net> docs: better command reference titles (#15567) (#15568) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> chore(deps): bump library/node from 20.6.1 to 20.7.0 in /ui-test (#15583) Bumps library/node from 20.6.1 to 20.7.0. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump library/node from 20.6.1 to 20.7.0 in /test/container (#15585) Bumps library/node from 20.6.1 to 20.7.0. --- updated-dependencies: - dependency-name: library/node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> docs: Add documentation on how to specify shard number for a cluster in "high availibility" doc (#5348) (#13258) Signed-off-by: Sridhar Nandigam <nandigamsridhar.v@gmail.com> docs: 'action' RBAC example for Kind without group (#15589) chore: add gdsoumya to reviewers (#15596) Signed-off-by: gdsoumya <44349253+gdsoumya@users.noreply.github.com> feat: added patch_ms and setop_ms timings to reconciliation logs (#15595) * feat: added patch_ms to reconciliation logs Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> * feat: added patch_ms and setop_ms timings to logs Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> --------- Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com> Removed conflicting files Signed-off-by: Gergely Czuczy <gergely.czuczy@sap.com> chore(action): minor lua changes (#15580) * chore(action): add newlines at eof Signed-off-by: Josh Soref <jsoref@gmail.com> * chore(action): fix whitespace indentation Signed-off-by: Josh Soref <jsoref@gmail.com> * chore(action): use local annotations Signed-off-by: Josh Soref <jsoref@gmail.com> --------- Signed-off-by: Josh Soref <jsoref@gmail.com> chore(deps): bump library/golang from `cffaba7` to `2270a40` (#15615) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> feat(extensions): Automatically apply extension configs without restarting API-Server (#15574) * feat: auto configure extensions Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * feat: auto-reload extension configs without restarting api-server Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * clean unused gorilla mux Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * update docs Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Address review comments Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Add more test cases Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * refactoring to reduce unnecessary function Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Add log Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * fix bugs found during manual tests Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> --------- Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> Update the supported version policy in Operator Manual Installation doc (#15619) The supported version policy mentioned in the operator manual installation document diverges from the official policy that is mentioned in the security policy and the release cadence. This change brings the version policy in line by referring the readers to the release and cadence documentation to check the specified policy. Signed-off-by: Muhammad Mooneeb Hussain <mooneeb.hussain@gmail.com> doc: resource tracking custom label configuration (#15587) Signed-off-by: Timoses <timoses@tutanota.com> feat(cli): tree option in output flag for app sync, app wait and app rollback for tree view (#15572) * app sync and app wait tree view changes Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * documentation changes Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * included the json,yaml and wide formats and removed the value assignment to the flag Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * Reoved extra spaces Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * removed extra spaces Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * refactored the code Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> * better log statements Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> --------- Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com> feat: dynamic rebalancing of clusters across shards (#15036) * Migrate Application Controller from Statefulset to Deployment Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add sharding deployment logic Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Update sharding logic and add comments Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add heartbeat as an environment variable Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add retry logic, heartbeat timeout environment variable Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * use the logic of pre-specified shard number on application controller pod Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * fix manifests Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * fix lint and e2e tests Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * comment out failing e2e test Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * increase readiness probe interval period Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * "comment out readiness probe to see if e2e tests succeed" Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * revert commented readiness probe Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * revert commented test case Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * read environment variable for application controller deployment name Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add nil check on replica count for deployment of application controller Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Address comments Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add Informer, Update documentation, add unit tests Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * update godoc Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * remove unwanted code and logs Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add more documentation Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * revert ApplicationController manifest to StatefulSet Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * reverting updated docs Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add documentation for the new dynamic distribution feature Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * update documentation Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add an overlay for application controller deployment and update documentation Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * fix nit Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Marking the feature as alpha Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * Add feature status link Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * revert go,mod changes Signed-off-by: ishitasequeira <ishiseq29@gmail.com> * update docs to avoid focusing on StatefulSet/Deployment (#26) * update docs to avoid focusing on StatefulSet/Deployment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * minor update to the doc Signed-off-by: ishitasequeira <ishiseq29@gmail.com> --------- Signed-off-by: ishitasequeira <ishiseq29@gmail.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> chore(deps): bump node version (#15616) * chore(deps): bump node version Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix version Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * update lockfile Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> feat(appset): add Support for AzureDevops Webhooks (#15047) Signed-off-by: Robin Lieb <robin.j.lieb@gmail.com> fix(cli): get latest app state before printing tree (#15639) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> chore(deps): bump actions/setup-node from 3.8.0 to 3.8.1 (#15108) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/bea5baf987ba7aa777a8a0b4ace377a21c45c381...5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Justin Marquis <76892343+34fathombelow@users.noreply.github.com> Co-authored-by: pasha-codefresh <pavel@codefresh.io> feat(kustomize): add patches field (#5114) (#14648) feat(health): Implement AnsibleJob CRD health checks (#14483) Signed-off-by: Mike Ng <ming@redhat.com> feat(health): add PushSecret health status and force-sync action (#14375) * feat(health): add `PushSecret` health status Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> * add status healthy Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> * Push action Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> * fix test Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> --------- Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> fix(kustomize): no concurrent processing if Kustomize patches are used (#15654) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> feat(appset): ignoreApplicationDifferences (#9101) (#14743) * feat(appset): ignoreDifferences (#9101) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * better error messages Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * do better Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * docs Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more tests, update docs Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * e2e test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * expect auto-added fields Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * correct label Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * better Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove line that was reverted Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * Update docs/operator-manual/applicationset.yaml Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove line that mysteriously causes applicationset/utils unit tests to fail Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * login to fix test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * maybe this will work, who knows Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * burn it all down Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * works on my machine Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix(applicationset): cannot validate inherited project permissions (#9298) (#15026) * fix(applicationset): cannot validate inherited project permissions Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> * update tests to reflect behavior Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> --------- Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> chore(deps): bump semver from 5.7.1 to 5.7.2 in /ui-test (#14457) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(ci): free up disk space (#15674) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix: add a not found check for application controller deployment (#15678) Signed-off-by: ishitasequeira <ishiseq29@gmail.com> [fix] sidebar style (#15652) Signed-off-by: ymktmk <ymktmk.tt@gmail.com> Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com> fix(ci): free up disk space (#15683) * fix(ci): free up disk space Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * Update .github/workflows/image-reuse.yaml Co-authored-by: Justin Marquis <76892343+34fathombelow@users.noreply.github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * Update .github/workflows/image-reuse.yaml Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Justin Marquis <76892343+34fathombelow@users.noreply.github.com> fix(ci): do not fail fast on e2e test failures (#15694) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix(ci): misplaced config option (#15698) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix(applicationset): git generator ignores empty files (#15661) Signed-off-by: Alexandre Gaudreault <alexandre.gaudreault@logmein.com> fix(appset): don't emit k8s events for unchanged apps, log at debug (#15659) (#15660) * fix(appset): don't emit k8s events for unchanged application events and move that scenario to debug logging level Signed-off-by: Eric Blackburn <eblackburn@indeed.com> * Retrigger CI pipeline Signed-off-by: Eric Blackburn <eblackburn@indeed.com> * Retrigger CI pipeline Signed-off-by: Eric Blackburn <eblackburn@indeed.com> --------- Signed-off-by: Eric Blackburn <eblackburn@indeed.com> Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> feat(ci): retry individual e2e tests (#15696) docs: Maintaining Uniformity In Documentation Writing Style (#15713) In the Projects section there are two words 'what' and 'where' are written in italic(in the first two sentences) but in the third sentence 'what' is written in normal text. So i changed the two words written in italic to normal text to maintain the uniformity of writing style of documentation. See this issue in the Projects section : "https://argo-cd.readthedocs.io/en/stable/user-guide/projects/" Signed-off-by: PranitRout07 <102309095+PranitRout07@users.noreply.github.com> docs: add dynamic cluster distribution doc in the menu (#15716) Converted italic text to normal text (#15692) To see the issue , go to this link "https://argo-cd.readthedocs.io/en/stable/operator-manual/app-any-namespace/" In Prerequisites section ,the word 'not' is unnecessarily written in italic. It should be written in normal text to maintain the uniformity. Signed-off-by: PranitRout07 <102309095+PranitRout07@users.noreply.github.com> Co-authored-by: Dan Garfield <dan@codefresh.io> fix(action): populate all fields of Job from CronJob (#15259) (#15727) Signed-off-by: sergey.ladutko <sergey.ladutko@vizor-games.com> Co-authored-by: sergey.ladutko <sergey.ladutko@vizor-games.com> fix(application-controller): Fix panic error when trying to scale application controller shards (#15725) * Added error checking to determine if application controller deployment is found or not Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com> * Fixed the informer to list deployments in namespace scope Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com> * Fixed readiness check probe for application controller when running as deployment Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com> --------- Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com> docs: move self-signed certs gitlab scm docs (#15720) fix: only enable dynamic cluster sharding feature explicitly (#15734) * fix: only enable dynamic cluster sharding feature explicitly Signed-off-by: Remington Breeze <remington@breeze.software> --------- Signed-off-by: Remington Breeze <remington@breeze.software> Fixed Custom Link Text not Hyperlinked (#15747) Visit this link to see the issue : https://argo-cd.readthedocs.io/en/stable/developer-guide/ci/#public-cd Signed-off-by: PranitRout07 <102309095+PranitRout07@users.noreply.github.com> docs: Add documentation for Zitadel SSO integration (#15029) * Add zitadel documentation Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Add zitadel docs images Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Update zitadel.md Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Update docs/operator-manual/user-management/zitadel.md Co-authored-by: Florian Forster <florian@zitadel.com> Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Update docs/operator-manual/user-management/zitadel.md Co-authored-by: Florian Forster <florian@zitadel.com> Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Fix typos Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Apply suggestions from code review Fix grammar issues Co-authored-by: Dan Garfield <dan@codefresh.io> Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> * Add zitadel page to mkdocs.yml Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> --------- Signed-off-by: Stephan Renggli <5135902+stephanrenggli@users.noreply.github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Dan Garfield <dan@codefresh.io> Co-authored-by: pasha-codefresh <pavel@codefresh.io> chore: set proper struct tag for ApplicationSetTerminalGenerator.Plugin field (#15742) Signed-off-by: chavacava <salvadorcavadini+github@gmail.com> test: bump k8s versions for e2e tests (#15766) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> docs: add Mercedes-Benz.io to user list (#15768) Signed-off-by: Gonçalo Montalvão Marques <9379664+gonmmarques@users.noreply.github.com> chore: don't make argocd-approvers owners of anything (#15774) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> docs: add `CONTRIBUTING.md` copy at repo root (#14889) * docs: add `CONTRIBUTING.md` symlink at repo root - having a `CONTRIBUTING.md` at the root of the repo is a common convention - I looked at the root initially, didn't find it, then checked `docs/` and saw one there and then went to the website - but potential contributors may not realize this, so a symlink should help with discoverability Signed-off-by: Anton Gilgur <agilgur5@gmail.com> * change to cp instead of symlink per review Signed-off-by: Anton Gilgur <agilgur5@gmail.com> --------- Signed-off-by: Anton Gilgur <agilgur5@gmail.com> chore: revert codeowners test change (#15777) This reverts commit 173eb5b33c0248b2316fa064eba9ffa5379a24ba. Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix: address nil pointer when controller runs with sts and replicas > 1 (#15770) * fix: address nil pointer when controller runs with sts and replicas > 1 Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * fix: lint Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * fix: better handle errors Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> --------- Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> chore: allow docs approvers to merge USERS.md changes (#15773) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix(plugin): remove git environment variables unavailable to plugin execution (#14998) (#15104) * remove git creds environment variables unavailable to plugin execution Signed-off-by: jmcshane <james.mcshane@superorbital.io> * remove integration test asserting askpass is forwarded Signed-off-by: jmcshane <james.mcshane@superorbital.io> --------- Signed-off-by: jmcshane <james.mcshane@superorbital.io> fix(ui): responsive topbar, filter button in application details page (#11188) (#15789) Signed-off-by: Julien Fuix <julienfuix@epitech.eu> Co-authored-by: Julien Fuix <julienfuix@epitech.eu> chore(cli): clarify core mode code (#15800) * chore(cli): clarify core mode code Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * rename function Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> chore: Add SCRM Lidl International Hub as users (#15801) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> docs: fix list format (#15798) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix(appset): add option to disable SCM providers entirely (#14246) (#15248) * feat(appset): add option to disable SCM providers entirely (#14246) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * clarify docs Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more clarification, small refactor Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more clarification Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * refactor Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix test assertion Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * simplify test expectation Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> fea(cli)t: Add example to --help output for "argocd appset get" (#15808) Signed-off-by: Michele Caci <michele.caci@gmail.com> fix: codeowners syntax error (#15781) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> fix(cli): Do not error out with no errors (#15688) test(e2e): do not always include plaintext for account update password (#15665) Signed-off-by: Chris Fry <christopherfry@google.com> test(e2e): update git submodule remote tests to use submodule url (#15701) Signed-off-by: Chris Fry <christopherfry@google.com> docs: actually all helm hooks are ignored (#15752) * docs: actually all helm hooks are ignored Signed-off-by: naruse666 <become15@i.softbank.jp> * fix: add "All of" Signed-off-by: naruse666 <become15@i.softbank.jp> * Update docs/user-guide/helm.md Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com> Signed-off-by: naruse <62323683+naruse666@users.noreply.github.com> --------- Signed-off-by: naruse666 <become15@i.softbank.jp> Signed-off-by: naruse <62323683+naruse666@users.noreply.github.com> Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com> feat(cli): Added example to --help output for context (#15809) * docs: fix list format (#15798) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> * fix(appset): add option to disable SCM providers entirely (#14246) (#15248) * feat(appset): add option to disable SCM providers entirely (#14246) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * clarify docs Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more clarification, small refactor Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more clarification Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * refactor Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix test assertion Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * simplify test expectation Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> * add context example to help Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> * add context example to help Signed-off-by: sagarwala Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> * fea(cli)t: Add example to --help output for "argocd appset get" (#15808) Signed-off-by: Michele Caci <michele.caci@gmail.com> Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> * fix: codeowners syntax error (#15781) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> * Trigger checks again Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: sagarwala1 <shailja_agarwala@intuit.com> Signed-off-by: Michele Caci <michele.caci@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Co-authored-by: Michele Caci <michele.caci@gmail.com> chore(ci): fix generate code CI failure (#15828) Signed-off-by: jmcshane <james.mcshane@superorbital.io> feat(cli): Add example to `--help` output 1 (#15782) * re-sign commit with DCO Signed-off-by: Dao Thanh Tung <ttdao.2015@accountancy.smu.edu.sg> * Update doc file Signed-off-by: Dao Thanh Tung <ttdao.2015@accountancy.smu.edu.sg> --------- Signed-off-by: Dao Thanh Tung <ttdao.2015@accountancy.smu.edu.sg> test(e2e): always specify master as the initial git branch (#15662) Signed-off-by: Chris Fry <christopherfry@google.com> feat(cli): Add examples to --help output for remaining "argocd repocreds" cmds (#15846) Signed-off-by: Michele Caci <michele.caci@gmail.com> feat(cli): Add examples to --help output for remaining "argocd account" (#15814) * feat: Add examples to --help output for remaining "argocd account" Signed-off-by: Michele Caci <michele.caci@gmail.com> * Update cmd/argocd/commands/account.go Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Michele Caci <michele.caci@gmail.com> --------- Signed-off-by: Michele Caci <michele.caci@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> feat(cli): Add example to --help output for app actions (#15822) Signed-off-by: kokikathir <kathiresankokilavani@gmail.com> feat(appset): fromYaml, fromYamlArray toYaml functions (#15063) * feat(appset): fromYaml, fromYamlArray toYaml functions Signed-off-by: Geoffrey Muselli <geoffrey.muselli@gmail.com> * fix(11993): Document and error messages Signed-off-by: gmuselli <geoffrey.muselli@gmail.com> --------- Signed-off-by: Geoffrey Muselli <geoffrey.muselli@gmail.com> Signed-off-by: gmuselli <geoffrey.muselli@gmail.com> chore: skip server certificate verification for http requests in e2e tests (#15733) * chore: skip verifying server certificate for http requests in e2e tests Signed-off-by: Chris Fry <christopherfry@google.com> * chore: skip certificate verification only for remote tests Signed-off-by: Chris Fry <christopherfry@google.com> --------- Signed-off-by: Chris Fry <christopherfry@google.com> docs: improve notifications docs (#15816) * docs: improve notifications docs Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * use a version compatible with Python 3.7, which is what RTD runs Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more fixes Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix(notifications): Allow notifications controller to notify on all namespaces (#15702) * Allow notifications controller to notify on all namespaces This adds functionality to the notifications controller to be notified of and send notifications for applications in any namespace. The namespaces to watch are controlled by the same --application-namespaces and ARGOCD_APPLICATION_NAMESPACES variables as in the application controller. Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au> * Add SEEK to users.md Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au> * Remove unused fields Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au> * Revert changes to Procfile Signed-off-by: Nik Skoufis <n.skoufis@gmail.com> * Fix unit tests Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au> * - add argocd namespaces environment variable to notifications controller Signed-off-by: Stewart Thomson <sthomson@wynshop.com> * - add example cluster role rbac Signed-off-by: Stewart Thomson <sthomson@wynshop.com> * - only look for projects in the controller's namespace (argocd by default) Signed-off-by: Stewart Thomson <sthomson@wynshop.com> * - update base manifest Signed-off-by: Stewart Thomson <sthomson@wynshop.com> * - skip app processing in notification controller Signed-off-by: Stewart Thomson <sthomson@wynshop.com> * added unit test and updated doc Signed-off-by: May Zhang <may_zhang@intuit.com> * added unit test and updated doc Signed-off-by: May Zhang <may_zhang@intuit.com> * updated examples/k8s-rbac/argocd-server-applications/kustomization.yaml's resources Signed-off-by: May Zhang <may_zhang@intuit.com> --------- Signed-off-by: Nikolas Skoufis <nskoufis@seek.com.au> Signed-off-by: Nik Skoufis <n.skoufis@gmail.com> Signed-off-by: Stewart Thomson <sthomson@wynshop.com> Signed-off-by: May Zhang <may_zhang@intuit.com> Co-authored-by: Nikolas Skoufis <nskoufis@seek.com.au> Co-authored-by: Nik Skoufis <n.skoufis@gmail.com> Co-authored-by: Stewart Thomson <sthomson@wynshop.com> chore: log more fields with error (#15735) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> feat(cli): Added example to --help output for bcrypt (#15838) * feat: Added example to --help output for bcrypt Signed-off-by: abalaraj <akash_balaraj@intuit.com> * feat: Added example to --help output for bcrypt Signed-off-by: abalaraj <akash_balaraj@intuit.com> --------- Signed-off-by: abalaraj <akash_balaraj@intuit.com> feat: Add examples to --help output for all "argocd proj" cmds (#15824) Signed-off-by: Michele Caci <michele.caci@gmail.com> chore(deps): bump gitops-engine (#15736) * chore(deps): bump gitops-engine Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * go mod tidy Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> feat(cli): Add example to argocd relogin command (#15839) * feat: Add example to argocd relogin command Signed-off-by: Chiranjeevi R <chiranjeevi.ramanatha@gmail.com> * feat: Add example to argocd relogin command Signed-off-by: Chiranjeevi R <chiranjeevi.ramanatha@gmail.com> * correc --sso flag Signed-off-by: Chiranjeevi R <chiranjeevi.ramanatha@gmail.com> * Apply suggestions from code review Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Chiranjeevi R <chiranjeevi.ramanatha@gmail.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> test(e2e): allow build of argocd-e2e-cluster image for remote tests (#15805) * chore: allow build of argocd-e2e-cluster image for remote testing Signed-off-by: Chris Fry <christopherfry@google.com> * Retrigger CI pipeline Signed-off-by: Chris Fry <christopherfry@google.com> --------- Signed-off-by: Chris Fry <christopherfry@google.com> docs: clarify health inheritance (#15799) * docs: resource health inheritance Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * write more better Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> fix: Replace antonmedv/expr with expr-lang/expr (#15879) feat(cli): Add examples to --help output for "logs APPNAME" (#15873) * feat: Add examples to --help output for logs APPNAME Signed-off-by: Ratan Gulati <ratangulati.dev@gmail.com> * feat: Add examples to --help output for logs APPNAME Signed-off-by: Ratan Gulati <ratangulati.dev@gmail.com> --------- Signed-off-by: Ratan Gulati <ratangulati.dev@gmail.com> feat(cli): Add examples to --help output for "set APPNAME" (#15872) * feat: Add examples to --help output for get APPNAME Signed-off-by: Ratan Gulati <ratangulati.dev@gmail.com> * feat: Add examples to --help output for get APPNAME Signed-off-by: Ratan Gulati <ratangulati.dev@gmail.com> --------- Signed-of…

…#13999) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of argoproj#11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* 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 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> * 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>

* 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> * 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> * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

…#13999) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of argoproj#11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* 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 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> * 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>

* 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> * 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> * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

…#13999) * fix: make managed namespaces more 'prune-proof' In the cases where someone would want to set resource tracking on a managed namespace, or if someone would want to migrate from having a namespace in Git to using `managedNamespaceMetadata`, we need to take steps to ensure that the namespace does not get pruned. In order to do that, we add the live namespace to the list of `targetObjs` (so that it's considered a part of the source even though it's not). Finally, we need to also ensure that the managed namespace is not considered `OutOfSync` (due to the same reason as above). This is a subset of argoproj#11350, the main difference being that this commit does not set resource tracking on its own, but can be opted into if people choose to do so. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * refactor: extract managed namespace check Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* 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> * 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> * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Signed-off-by: Kevin Lyda <kevin@lyda.ie>

* 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 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> * 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>

* 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> * 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> * test: add test cases This adds a test case showing that an ns manifest will override `managedNamespaceMetadata` without failing horribly (as it currently does on `HEAD`), as well as a "standard" mNMd diff vs live. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

blakepettersson requested review from alexmt, crenshaw-dev and leoluz June 12, 2023 09:56

crenshaw-dev changed the title ~~fix: make managed namespaces more 'prune-proof'~~ fix(controller): make managed namespaces more 'prune-proof' Jun 12, 2023

jsoref reviewed Jun 12, 2023

View reviewed changes

controller/state.go Outdated Show resolved Hide resolved

refactor: extract managed namespace check

4c0db4a

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

ishitasequeira approved these changes Jun 19, 2023

View reviewed changes

blakepettersson mentioned this pull request Sep 13, 2023

Namespace created explicitly gets deleted even though CreateNamespace=true is set on an Application #15441

Closed

3 tasks

jannfis merged commit 9240655 into argoproj:master Sep 13, 2023

blakepettersson deleted the fix/do-not-prune-managed-namespaces branch September 13, 2023 16:04

gcp-cherry-pick-bot bot mentioned this pull request Sep 13, 2023

fix(controller): make managed namespaces more 'prune-proof' (cherry-pick #13999) #15488

Merged

blakepettersson mentioned this pull request Sep 26, 2023

fix: check for double definition #15670

Merged

13 tasks

This was referenced Nov 8, 2023

fix: check for double definition (cherry-pick #15670) #16271

Merged

fix: check for double definition (cherry-pick #15670) #16272

Merged

blakepettersson mentioned this pull request Jan 23, 2025

REQUEST: Promotion to Approver for blakepettersson argoproj/argoproj#350

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(controller): make managed namespaces more 'prune-proof'#13999

fix(controller): make managed namespaces more 'prune-proof'#13999
jannfis merged 2 commits intoargoproj:masterfrom
blakepettersson:fix/do-not-prune-managed-namespaces

blakepettersson commented Jun 12, 2023 •

edited

Loading

Uh oh!

Uh oh!

codecov bot commented Jun 13, 2023

Uh oh!

blakepettersson commented Sep 13, 2023

Uh oh!

jannfis commented Sep 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

blakepettersson commented Jun 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jun 13, 2023

Codecov Report

Uh oh!

blakepettersson commented Sep 13, 2023

Uh oh!

jannfis commented Sep 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

blakepettersson commented Jun 12, 2023 •

edited

Loading