Skip to content

Commit dcd8f7d

Browse files
chengfangrainsundependabot[bot]
authored
chore(deps): cherry-pick or apply recent changes from master to crd branch (#1270)
Signed-off-by: Cheng Fang <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Max Lyu <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent ac5b3a0 commit dcd8f7d

File tree

12 files changed

+225
-94
lines changed

12 files changed

+225
-94
lines changed

.github/workflows/ci-tests.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
- name: Setup Golang
21-
uses: actions/setup-go@v5
21+
uses: actions/setup-go@v6
2222
with:
2323
go-version-file: go.mod
2424
- name: Download all Go modules
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
- name: Install Kustomize v2
3838
run: |
3939
set -xo pipefail
@@ -60,9 +60,9 @@ jobs:
6060
runs-on: ubuntu-latest
6161
steps:
6262
- name: Checkout code
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v5
6464
- name: Setup Golang
65-
uses: actions/setup-go@v5
65+
uses: actions/setup-go@v6
6666
with:
6767
go-version-file: go.mod
6868
cache: false
@@ -78,9 +78,9 @@ jobs:
7878
runs-on: ubuntu-latest
7979
steps:
8080
- name: Checkout code
81-
uses: actions/checkout@v4
81+
uses: actions/checkout@v5
8282
- name: Setup Golang
83-
uses: actions/setup-go@v5
83+
uses: actions/setup-go@v6
8484
with:
8585
go-version-file: go.mod
8686
- name: Run tests
@@ -129,9 +129,9 @@ jobs:
129129
working-directory: ./registry-scanner
130130
steps:
131131
- name: Checkout code
132-
uses: actions/checkout@v4
132+
uses: actions/checkout@v5
133133
- name: Setup Golang
134-
uses: actions/setup-go@v5
134+
uses: actions/setup-go@v6
135135
with:
136136
go-version-file: go.mod
137137
- name: Download all Go modules

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL

.github/workflows/create-release-draft.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Get version
2020
id: version
2121
run: |
2222
echo version=$(cat VERSION) >> $GITHUB_OUTPUT
2323
2424
- name: Setup Golang
25-
uses: actions/setup-go@v5
25+
uses: actions/setup-go@v6
2626
with:
2727
go-version-file: go.mod
2828

.github/workflows/image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
with:
2020
path: argocd-image-updater
2121
- name: Setup qemu

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module github.com/argoproj-labs/argocd-image-updater
33
go 1.24.6
44

55
require (
6-
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20250908234756-5f7bb2916132
6+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.2.0
77
github.com/argoproj/argo-cd/v3 v3.1.8
88
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec
99
github.com/bmatcuk/doublestar/v4 v4.9.1
1010
github.com/bombsimon/logrusr/v2 v2.0.1
11-
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0
11+
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0
1212
github.com/distribution/distribution/v3 v3.0.0-20230722181636-7b502560cad4
1313
github.com/go-git/go-git/v5 v5.16.2
1414
github.com/go-logr/logr v1.4.3
@@ -18,14 +18,14 @@ require (
1818
github.com/patrickmn/go-cache v2.1.1-0.20191004192108-46f407853014+incompatible
1919
github.com/prometheus/client_golang v1.23.0
2020
github.com/sirupsen/logrus v1.9.3
21-
github.com/spf13/cobra v1.9.1
22-
github.com/spf13/pflag v1.0.7
23-
github.com/stretchr/testify v1.10.0
21+
github.com/spf13/cobra v1.10.1
22+
github.com/spf13/pflag v1.0.10
23+
github.com/stretchr/testify v1.11.1
2424
go.uber.org/ratelimit v0.3.1
2525
golang.org/x/crypto v0.40.0
2626
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
27-
golang.org/x/oauth2 v0.30.0
28-
golang.org/x/sync v0.16.0
27+
golang.org/x/oauth2 v0.31.0
28+
golang.org/x/sync v0.17.0
2929
google.golang.org/grpc v1.73.0
3030
k8s.io/api v0.33.1
3131
k8s.io/apimachinery v0.33.1
@@ -98,7 +98,7 @@ require (
9898
github.com/google/gnostic-models v0.6.9 // indirect
9999
github.com/google/go-cmp v0.7.0 // indirect
100100
github.com/google/go-github/v69 v69.2.0 // indirect
101-
github.com/google/go-github/v72 v72.0.0 // indirect
101+
github.com/google/go-github/v75 v75.0.0 // indirect
102102
github.com/google/go-querystring v1.1.0 // indirect
103103
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
104104
github.com/gorilla/mux v1.8.0 // indirect

go.sum

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4m
6767
github.com/bombsimon/logrusr/v2 v2.0.1/go.mod h1:ByVAX+vHdLGAfdroiMg6q0zgq2FODY2lc5YJvzmOJio=
6868
github.com/bombsimon/logrusr/v4 v4.1.0 h1:uZNPbwusB0eUXlO8hIUwStE6Lr5bLN6IgYgG+75kuh4=
6969
github.com/bombsimon/logrusr/v4 v4.1.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8=
70-
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 h1:B91r9bHtXp/+XRgS5aZm6ZzTdz3ahgJYmkt4xZkgDz8=
71-
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0/go.mod h1:OeVe5ggFzoBnmgitZe/A+BqGOnv1DvU/0uiLQi1wutM=
70+
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 h1:SmbUK/GxpAspRjSQbB6ARvH+ArzlNzTtHydNyXUQ6zg=
71+
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0/go.mod h1:vuD/xvJT9Y+ZVZRv4HQ42cMyPFIYqpc7AbB4Gvt/DlY=
7272
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
7373
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
7474
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
@@ -250,8 +250,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
250250
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
251251
github.com/google/go-github/v69 v69.2.0 h1:wR+Wi/fN2zdUx9YxSmYE0ktiX9IAR/BeePzeaUUbEHE=
252252
github.com/google/go-github/v69 v69.2.0/go.mod h1:xne4jymxLR6Uj9b7J7PyTpkMYstEMMwGZa0Aehh1azM=
253-
github.com/google/go-github/v72 v72.0.0 h1:FcIO37BLoVPBO9igQQ6tStsv2asG4IPcYFi655PPvBM=
254-
github.com/google/go-github/v72 v72.0.0/go.mod h1:WWtw8GMRiL62mvIquf1kO3onRHeWWKmK01qdCY8c5fg=
253+
github.com/google/go-github/v75 v75.0.0 h1:k7q8Bvg+W5KxRl9Tjq16a9XEgVY1pwuiG5sIL7435Ic=
254+
github.com/google/go-github/v75 v75.0.0/go.mod h1:H3LUJEA1TCrzuUqtdAQniBNwuKiQIqdGKgBo1/M/uqI=
255255
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
256256
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
257257
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -489,12 +489,12 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
489489
github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
490490
github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
491491
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
492-
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
493-
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
492+
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
493+
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
494494
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
495-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
496-
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
497-
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
495+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
496+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
497+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
498498
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
499499
github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
500500
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -514,8 +514,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
514514
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
515515
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
516516
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
517-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
518517
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
518+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
519+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
519520
github.com/vmihailenco/go-tinylfu v0.2.2 h1:H1eiG6HM36iniK6+21n9LLpzx1G9R3DJa2UjUjbynsI=
520521
github.com/vmihailenco/go-tinylfu v0.2.2/go.mod h1:CutYi2Q9puTxfcolkliPq4npPuofg9N9t8JVrjzwa3Q=
521522
github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
@@ -673,8 +674,8 @@ golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
673674
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
674675
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
675676
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
676-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
677-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
677+
golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
678+
golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
678679
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
679680
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
680681
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -691,8 +692,8 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
691692
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
692693
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
693694
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
694-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
695-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
695+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
696+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
696697
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
697698
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
698699
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

registry-scanner/go.mod

Lines changed: 17 additions & 18 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
13-
github.com/stretchr/testify v1.10.0
13+
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
16-
golang.org/x/sync v0.16.0
15+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
16+
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 (
@@ -34,10 +34,8 @@ require (
3434
github.com/go-openapi/jsonreference v0.20.2 // indirect
3535
github.com/go-openapi/swag v0.23.0 // 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
@@ -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)