Skip to content

Commit 5adfac5

Browse files
authored
Merge pull request #529 from mbaldessari/update-vendoring3
Update argocd to v3.0.23
2 parents 21262c6 + 6ec4b31 commit 5adfac5

4 files changed

Lines changed: 14 additions & 11 deletions

File tree

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
)
3030

3131
require (
32-
github.com/argoproj/argo-cd/v3 v3.0.19
32+
github.com/argoproj/argo-cd/v3 v3.0.23
3333
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250308055145-5fe7bb3edc86
3434
sigs.k8s.io/controller-tools v0.16.4
3535
)
@@ -49,7 +49,7 @@ require (
4949
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
5050
github.com/Microsoft/go-winio v0.6.2 // indirect
5151
github.com/ProtonMail/go-crypto v1.1.6 // indirect
52-
github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 // indirect
52+
github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3 // indirect
5353
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect
5454
github.com/beorn7/perks v1.0.1 // indirect
5555
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -187,7 +187,6 @@ require (
187187
golang.org/x/time v0.12.0 // indirect
188188
golang.org/x/tools v0.41.0 // indirect
189189
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
190-
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
191190
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
192191
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
193192
google.golang.org/grpc v1.79.3 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
4545
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
4646
github.com/argoproj-labs/argocd-operator v0.15.0 h1:7zSjRchKUBCGBpz4v1pJ/Igmgn5blXorTxW0Ch9hWZ0=
4747
github.com/argoproj-labs/argocd-operator v0.15.0/go.mod h1:5jApqvt/B2NpI2fFEa7g/8TGUvnesspv86yu1E4hVUI=
48-
github.com/argoproj/argo-cd/v3 v3.0.19 h1:RtihsPLt+L3F4TfEHUKCsZlqgmOBv9XAKCHi/wvJ1+w=
49-
github.com/argoproj/argo-cd/v3 v3.0.19/go.mod h1:oTCI5r+Hacij94yJto2/mVXAHB8r3375h9SInqbS8EM=
50-
github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 h1:OsQxWX8UHdwXuy72Y1Js8gQY3xmOzFEieCSpMoXKFb8=
51-
github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ=
48+
github.com/argoproj/argo-cd/v3 v3.0.23 h1:rYOpj03ALBnOISJG/q84mC9JuDm7m0GO3W4I3Hmu8D8=
49+
github.com/argoproj/argo-cd/v3 v3.0.23/go.mod h1:HvP2NBX0SIz23ebZ93TkFodDD94unFoE15H5chdSUlc=
50+
github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3 h1:Nw5ZqatjlxUgzWMLZ3Josj7csW2TQSYLIP6D9IGz+kY=
51+
github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ=
5252
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=
5353
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5/go.mod h1:ebVOzFJphdN1p6EG2mIMECv/3Rk/almSaxIYuFAmsSw=
5454
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

vendor/github.com/argoproj/argo-cd/v3/util/git/workaround.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ github.com/ProtonMail/go-crypto/openpgp/x448
123123
## explicit; go 1.24.6
124124
github.com/argoproj-labs/argocd-operator/api/v1beta1
125125
github.com/argoproj-labs/argocd-operator/common
126-
# github.com/argoproj/argo-cd/v3 v3.0.19
126+
# github.com/argoproj/argo-cd/v3 v3.0.23
127127
## explicit; go 1.24.6
128128
github.com/argoproj/argo-cd/v3/assets
129129
github.com/argoproj/argo-cd/v3/common
@@ -157,7 +157,7 @@ github.com/argoproj/argo-cd/v3/util/regex
157157
github.com/argoproj/argo-cd/v3/util/security
158158
github.com/argoproj/argo-cd/v3/util/versions
159159
github.com/argoproj/argo-cd/v3/util/workloadidentity
160-
# github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4
160+
# github.com/argoproj/gitops-engine v0.7.1-0.20250905171100-0882c168faa3
161161
## explicit; go 1.23.5
162162
github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/api/v1/endpoints
163163
github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/util/hash
@@ -969,8 +969,6 @@ golang.org/x/tools/internal/typesinternal
969969
golang.org/x/tools/internal/versions
970970
# golang.org/x/tools/go/expect v0.1.1-deprecated
971971
## explicit; go 1.23.0
972-
# golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated
973-
## explicit; go 1.23.0
974972
# gomodules.xyz/jsonpatch/v2 v2.4.0
975973
## explicit; go 1.20
976974
gomodules.xyz/jsonpatch/v2

0 commit comments

Comments
 (0)