chore: Update to newer argocd version for better API compatibility #594

jessebye · 2023-07-19T19:15:07Z

Should resolve bugs like this:

That are caused by using an outdated version of Argo's Application spec.

codecov-commenter · 2023-07-19T19:20:10Z

Codecov Report

Merging #594 (b3740e4) into master (f5419f6) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master     #594   +/-   ##
=======================================
  Coverage   65.63%   65.63%           
=======================================
  Files          22       22           
  Lines        2069     2069           
=======================================
  Hits         1358     1358           
  Misses        577      577           
  Partials      134      134

Impacted Files	Coverage Δ
pkg/argocd/argocd.go	`66.39% <100.00%> (ø)`
pkg/argocd/gitcreds.go	`76.19% <100.00%> (ø)`
pkg/argocd/update.go	`66.05% <100.00%> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

jessebye · 2023-07-19T20:05:03Z

@jannfis If you would kindly review? This should resolve at least two reported bugs and unblock our team as well! Thank you!

jessebye · 2023-07-19T21:38:02Z

Built and pushed to Dockerhub for testing. Works great in our environment, resolves the issue we were having with some fields being removed every time it updated the Argo Applications. https://hub.docker.com/r/riskalyze/argocd-image-updater

jessebye · 2023-07-19T21:44:20Z

pkg/argocd/argocd_test.go

@@ -188,7 +188,7 @@ func Test_FilterApplicationsForUpdate(t *testing.T) {
 				},
 				Spec: v1alpha1.ApplicationSpec{},
 				Status: v1alpha1.ApplicationStatus{
-					SourceType: v1alpha1.ApplicationSourceTypeKsonnet,
+					SourceType: v1alpha1.ApplicationSourceTypePlugin,


Ksonnet was deprecated and removed from Argo CD, so we need to use a different unsupported source type here.

jessebye · 2023-07-19T21:45:40Z

go.mod

-	github.com/argoproj/argo-cd/v2 v2.2.7
-	github.com/argoproj/gitops-engine v0.5.2
-	github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0
+	github.com/argoproj/argo-cd/v2 v2.7.7


Updates argo-cd and associated modules to latest matching versions.

jannfis · 2023-07-19T21:52:55Z

Thanks a lot for submitting this PR, @jessebye, I very much appreciate it!

Please allow me some time for review & merge, as I'm off this week. I will come back to this PR as soon as time allows.

jannfis

LGTM, thanks a lot!

Sorry for taking a while to review & merge.

…rgoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> Signed-off-by: Jarvis Yang <jarvis.yang@recurohealth.com>

…rgoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

Signed-off-by: satoru <satorulogic@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> docs: Fixed typo (argoproj-labs#589) Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Preallocate space for slices with known size (argoproj-labs#575) Signed-off-by: satoru <satorulogic@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#590) * ci: Fix codegen Signed-off-by: jannfis <jann@mistrust.net> * Fix tar call Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> feat: Respect original parameter overrides with git write-back (argoproj-labs#573) * Fix original override not respected Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add writeOverrides unittest Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add helm override commit test Signed-off-by: KS. Yim <ks.yim@linecorp.com> * lint Signed-off-by: KS. Yim <ks.yim@linecorp.com> * fix shadowed err Signed-off-by: KS. Yim <ks.yim@linecorp.com> --------- Signed-off-by: KS. Yim <ks.yim@linecorp.com> Co-authored-by: KS. Yim <ks.yim@linecorp.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Update to newer argocd version for better API compatibility (argoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore(deps): upgrade dependencies for fix vulnerabilities (argoproj-labs#599) Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: tighten securityContext to comply with restricted PSS (argoproj-labs#600) makes argocd-image-updater compatible with restricted Pod Security Standard Signed-off-by: Takeo Sawada <myc.monad@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> feat: Add possibility to specify write-back GIT repository as annotation (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: support ocischema.DeserializedImageIndex in registry client Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix test Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> merge master Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix go mods Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> refactor: use shared function to reduce duplication Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> merge master Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix go mods Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> Fix after rebase Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Fix spell checking config (argoproj-labs#577) Signed-off-by: satoru <satorulogic@gmail.com> docs: Fixed typo (argoproj-labs#589) chore: Preallocate space for slices with known size (argoproj-labs#575) Signed-off-by: satoru <satorulogic@gmail.com> ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#590) * ci: Fix codegen Signed-off-by: jannfis <jann@mistrust.net> * Fix tar call Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> feat: Respect original parameter overrides with git write-back (argoproj-labs#573) * Fix original override not respected Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add writeOverrides unittest Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add helm override commit test Signed-off-by: KS. Yim <ks.yim@linecorp.com> * lint Signed-off-by: KS. Yim <ks.yim@linecorp.com> * fix shadowed err Signed-off-by: KS. Yim <ks.yim@linecorp.com> --------- Signed-off-by: KS. Yim <ks.yim@linecorp.com> Co-authored-by: KS. Yim <ks.yim@linecorp.com> chore: Update to newer argocd version for better API compatibility (argoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore(deps): upgrade dependencies for fix vulnerabilities (argoproj-labs#599) Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com> fix: tighten securityContext to comply with restricted PSS (argoproj-labs#600) makes argocd-image-updater compatible with restricted Pod Security Standard Signed-off-by: Takeo Sawada <myc.monad@gmail.com>

…rgoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> Signed-off-by: Francesc Arbona <francesc.arbona@global.ntt>

…rgoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

jessebye force-pushed the go-mod-update branch from dd09f6a to 0c24a33 Compare July 19, 2023 19:15

jessebye added 3 commits July 19, 2023 12:24

fix: update go mods to use newer argocd app definition

727d573

Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

fix deps and tests

1405f2d

Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

fix spelling

b3740e4

Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

jessebye force-pushed the go-mod-update branch from f0a98e2 to b3740e4 Compare July 19, 2023 19:24

jessebye mentioned this pull request Jul 19, 2023

App of apps drifts out of sync immediately after syncing, losing ignoreMissingValueFiles and selfHeal parameters argoproj/argo-cd#14591

Closed

3 tasks

jessebye commented Jul 19, 2023

View reviewed changes

jannfis approved these changes Jul 30, 2023

View reviewed changes

jannfis changed the title ~~Update to newer argocd version for better API compatibility~~ chore: Update to newer argocd version for better API compatibility Jul 30, 2023

jannfis merged commit d5a8f94 into argoproj-labs:master Jul 30, 2023
10 checks passed

jannfis mentioned this pull request Jul 30, 2023

Upgrade dependencies for fix vulnerabilities #599

Merged

jessebye deleted the go-mod-update branch July 31, 2023 16:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Update to newer argocd version for better API compatibility #594

chore: Update to newer argocd version for better API compatibility #594

jessebye commented Jul 19, 2023

codecov-commenter commented Jul 19, 2023 •

edited

Loading

jessebye commented Jul 19, 2023

jessebye commented Jul 19, 2023

jessebye Jul 19, 2023

jessebye Jul 19, 2023

jannfis commented Jul 19, 2023 •

edited

Loading

jannfis left a comment

chore: Update to newer argocd version for better API compatibility #594

chore: Update to newer argocd version for better API compatibility #594

Conversation

jessebye commented Jul 19, 2023

codecov-commenter commented Jul 19, 2023 • edited Loading

Codecov Report

jessebye commented Jul 19, 2023

jessebye commented Jul 19, 2023

jessebye Jul 19, 2023

Choose a reason for hiding this comment

jessebye Jul 19, 2023

Choose a reason for hiding this comment

jannfis commented Jul 19, 2023 • edited Loading

jannfis left a comment

Choose a reason for hiding this comment

codecov-commenter commented Jul 19, 2023 •

edited

Loading

jannfis commented Jul 19, 2023 •

edited

Loading