Skip to content

Commit d5c46b5

Browse files
chengfangchengfang
authored
chore(deps): sync up direct dependencies to have the same versions between the main module and registry-scanner submodule (#1269)
Signed-off-by: Cheng Fang <[email protected]>
1 parent 0498ad0 commit d5c46b5

File tree

4 files changed

+83
-70
lines changed

4 files changed

+83
-70
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
golang.org/x/crypto v0.40.0
2222
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
2323
golang.org/x/oauth2 v0.31.0
24-
golang.org/x/sync v0.16.0
24+
golang.org/x/sync v0.17.0
2525
google.golang.org/grpc v1.73.0
2626
k8s.io/api v0.33.1
2727
k8s.io/apimachinery v0.33.1
@@ -183,7 +183,7 @@ require (
183183

184184
replace (
185185
// Uncomment for development and local testing, and comment out for releases
186-
// github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner/
186+
github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner/
187187
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
188188

189189
k8s.io/api => k8s.io/api v0.33.1

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj
3737
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
3838
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
3939
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
40-
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.2.0 h1:MKXNzhAMkOZqskTJINZbCajNf/f2QTBbhC2QQlWZ2xI=
41-
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.2.0/go.mod h1:T+ZR4jBqdqQtUFzvB9T1V9M5GVoV8WAHIackJ3En2lo=
4240
github.com/argoproj/argo-cd/v3 v3.1.8 h1:NkLPiRI5qGkV+q1EN3O7/0Wb9O/MVl62vadKteZqMUw=
4341
github.com/argoproj/argo-cd/v3 v3.1.8/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
4442
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4=
@@ -673,8 +671,8 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
673671
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
674672
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
675673
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
676-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
677-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
674+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
675+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
678676
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
679677
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
680678
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

‎registry-scanner/go.mod‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ require (
88
github.com/distribution/distribution/v3 v3.0.0-20230722181636-7b502560cad4
99
github.com/opencontainers/go-digest v1.0.0
1010
github.com/opencontainers/image-spec v1.1.1
11-
github.com/patrickmn/go-cache v2.1.0+incompatible
11+
github.com/patrickmn/go-cache v2.1.1-0.20191004192108-46f407853014+incompatible
1212
github.com/sirupsen/logrus v1.9.3
1313
github.com/stretchr/testify v1.11.1
1414
go.uber.org/ratelimit v0.3.1
15-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
15+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
1616
golang.org/x/sync v0.17.0
1717
gopkg.in/yaml.v2 v2.4.0
18-
k8s.io/api v0.32.2
19-
k8s.io/apimachinery v0.32.2
20-
k8s.io/client-go v0.32.2
18+
k8s.io/api v0.33.1
19+
k8s.io/apimachinery v0.33.1
20+
k8s.io/client-go v0.33.1
2121
)
2222

2323
require (
@@ -27,24 +27,22 @@ require (
2727
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2828
github.com/docker/go-metrics v0.0.1 // indirect
2929
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
30-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
31-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
32-
github.com/go-logr/logr v1.4.2 // indirect
33-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
34-
github.com/go-openapi/jsonreference v0.20.2 // indirect
35-
github.com/go-openapi/swag v0.23.0 // indirect
30+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
31+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
32+
github.com/go-logr/logr v1.4.3 // indirect
33+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
34+
github.com/go-openapi/jsonreference v0.21.0 // indirect
35+
github.com/go-openapi/swag v0.23.1 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
37-
github.com/golang/protobuf v1.5.4 // indirect
38-
github.com/google/gnostic-models v0.6.8 // indirect
39-
github.com/google/go-cmp v0.6.0 // indirect
40-
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/gnostic-models v0.6.9 // indirect
38+
github.com/google/go-cmp v0.7.0 // indirect
4139
github.com/google/uuid v1.6.0 // indirect
4240
github.com/gorilla/mux v1.8.0 // indirect
4341
github.com/hashicorp/golang-lru v0.5.4 // indirect
4442
github.com/josharian/intern v1.0.0 // indirect
4543
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/klauspost/compress v1.16.5 // indirect
47-
github.com/mailru/easyjson v0.7.7 // indirect
44+
github.com/klauspost/compress v1.17.0 // indirect
45+
github.com/mailru/easyjson v0.9.0 // indirect
4846
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4947
github.com/modern-go/reflect2 v1.0.2 // indirect
5048
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -62,21 +60,22 @@ require (
6260
golang.org/x/sys v0.31.0 // indirect
6361
golang.org/x/term v0.30.0 // indirect
6462
golang.org/x/text v0.23.0 // indirect
65-
golang.org/x/time v0.7.0 // indirect
66-
google.golang.org/protobuf v1.35.1 // indirect
63+
golang.org/x/time v0.9.0 // indirect
64+
google.golang.org/protobuf v1.36.5 // indirect
6765
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6866
gopkg.in/inf.v0 v0.9.1 // indirect
6967
gopkg.in/yaml.v3 v3.0.1 // indirect
7068
k8s.io/klog/v2 v2.130.1 // indirect
71-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
69+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
7270
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
7371
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
72+
sigs.k8s.io/randfill v1.0.0 // indirect
73+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
7574
sigs.k8s.io/yaml v1.4.0 // indirect
7675
)
7776

7877
replace (
79-
k8s.io/api => k8s.io/api v0.32.2
80-
k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
81-
k8s.io/client-go => k8s.io/client-go v0.32.2
78+
k8s.io/api => k8s.io/api v0.33.1
79+
k8s.io/apimachinery => k8s.io/apimachinery v0.33.1
80+
k8s.io/client-go => k8s.io/client-go v0.33.1
8281
)

0 commit comments

Comments
 (0)