From 6ec4b31be99cbc2b92cea64f654df3aa9c2b50b7 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 23 Mar 2026 21:13:41 +0100 Subject: [PATCH] Update argocd to v3.0.23 --- go.mod | 5 ++--- go.sum | 8 ++++---- .../github.com/argoproj/argo-cd/v3/util/git/workaround.go | 6 ++++++ vendor/modules.txt | 6 ++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 0f6766419..464154e85 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( ) require ( - github.com/argoproj/argo-cd/v3 v3.0.19 + github.com/argoproj/argo-cd/v3 v3.0.23 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250308055145-5fe7bb3edc86 sigs.k8s.io/controller-tools v0.16.4 ) @@ -49,7 +49,7 @@ require ( github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.1.6 // indirect - github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 // indirect + github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3 // indirect github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -187,7 +187,6 @@ require ( golang.org/x/time v0.12.0 // indirect golang.org/x/tools v0.41.0 // indirect golang.org/x/tools/go/expect v0.1.1-deprecated // indirect - golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect google.golang.org/grpc v1.79.3 // indirect diff --git a/go.sum b/go.sum index db053bc8b..1e93e2fb6 100644 --- a/go.sum +++ b/go.sum @@ -45,10 +45,10 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/argoproj-labs/argocd-operator v0.15.0 h1:7zSjRchKUBCGBpz4v1pJ/Igmgn5blXorTxW0Ch9hWZ0= github.com/argoproj-labs/argocd-operator v0.15.0/go.mod h1:5jApqvt/B2NpI2fFEa7g/8TGUvnesspv86yu1E4hVUI= -github.com/argoproj/argo-cd/v3 v3.0.19 h1:RtihsPLt+L3F4TfEHUKCsZlqgmOBv9XAKCHi/wvJ1+w= -github.com/argoproj/argo-cd/v3 v3.0.19/go.mod h1:oTCI5r+Hacij94yJto2/mVXAHB8r3375h9SInqbS8EM= -github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 h1:OsQxWX8UHdwXuy72Y1Js8gQY3xmOzFEieCSpMoXKFb8= -github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ= +github.com/argoproj/argo-cd/v3 v3.0.23 h1:rYOpj03ALBnOISJG/q84mC9JuDm7m0GO3W4I3Hmu8D8= +github.com/argoproj/argo-cd/v3 v3.0.23/go.mod h1:HvP2NBX0SIz23ebZ93TkFodDD94unFoE15H5chdSUlc= +github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3 h1:Nw5ZqatjlxUgzWMLZ3Josj7csW2TQSYLIP6D9IGz+kY= +github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5/go.mod h1:ebVOzFJphdN1p6EG2mIMECv/3Rk/almSaxIYuFAmsSw= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= diff --git a/vendor/github.com/argoproj/argo-cd/v3/util/git/workaround.go b/vendor/github.com/argoproj/argo-cd/v3/util/git/workaround.go index 49cdc5634..63f69f81c 100644 --- a/vendor/github.com/argoproj/argo-cd/v3/util/git/workaround.go +++ b/vendor/github.com/argoproj/argo-cd/v3/util/git/workaround.go @@ -85,6 +85,12 @@ func listRemote(r *git.Remote, o *git.ListOptions, insecure bool, creds Creds, p var resultRefs []*plumbing.Reference _ = refs.ForEach(func(ref *plumbing.Reference) error { + if ref.Name().IsTag() { + if peeled, ok := ar.Peeled[ref.Name().String()]; ok { + resultRefs = append(resultRefs, plumbing.NewHashReference(ref.Name(), peeled)) + return nil + } + } resultRefs = append(resultRefs, ref) return nil }) diff --git a/vendor/modules.txt b/vendor/modules.txt index 948965843..51c236374 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -123,7 +123,7 @@ github.com/ProtonMail/go-crypto/openpgp/x448 ## explicit; go 1.24.6 github.com/argoproj-labs/argocd-operator/api/v1beta1 github.com/argoproj-labs/argocd-operator/common -# github.com/argoproj/argo-cd/v3 v3.0.19 +# github.com/argoproj/argo-cd/v3 v3.0.23 ## explicit; go 1.24.6 github.com/argoproj/argo-cd/v3/assets github.com/argoproj/argo-cd/v3/common @@ -157,7 +157,7 @@ github.com/argoproj/argo-cd/v3/util/regex github.com/argoproj/argo-cd/v3/util/security github.com/argoproj/argo-cd/v3/util/versions github.com/argoproj/argo-cd/v3/util/workloadidentity -# github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 +# github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3 ## explicit; go 1.23.5 github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/api/v1/endpoints github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/util/hash @@ -969,8 +969,6 @@ golang.org/x/tools/internal/typesinternal golang.org/x/tools/internal/versions # golang.org/x/tools/go/expect v0.1.1-deprecated ## explicit; go 1.23.0 -# golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated -## explicit; go 1.23.0 # gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2