Skip to content

Commit e71b77b

Browse files
authored
Merge branch 'master' into feat/update-behavior
2 parents 10b66f1 + f93f013 commit e71b77b

File tree

14 files changed

+69
-59
lines changed

14 files changed

+69
-59
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ supported yet (and maybe never will).
2222
Read
2323
[the documentation](https://argocd-image-updater.readthedocs.io/en/stable/)
2424
for more information on how to setup and run Argo CD Image Updater and to get
25-
known to it's features and limitations.
25+
known to its features and limitations.
2626

2727
Above URL points to the documentation for the current release. If you are
2828
interested in documentation of upcoming features, check out the

cmd/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func runImageUpdater(cfg *ImageUpdaterConfig, warmUp bool) (argocd.ImageUpdaterR
316316
wg.Add(len(appList))
317317

318318
for app, curApplication := range appList {
319-
lockErr := sem.Acquire(context.TODO(), 1)
319+
lockErr := sem.Acquire(context.Background(), 1)
320320
if lockErr != nil {
321321
log.Errorf("Could not acquire semaphore for application %s: %v", app, lockErr)
322322
// Release entry in wait group on error, too - we're never gonna execute

cmd/util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestGetKubeConfig(t *testing.T) {
4141

4242
for _, tt := range tests {
4343
t.Run(tt.name, func(t *testing.T) {
44-
client, err := getKubeConfig(context.TODO(), tt.namespace, tt.configPath)
44+
client, err := getKubeConfig(context.Background(), tt.namespace, tt.configPath)
4545
if tt.expectError {
4646
require.Error(t, err)
4747
} else {

docs/basics/update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The workflow of Argo CD Image Updater can be described as follows:
1414
whose name match a given pattern, or match a given label.
1515

1616
* It then goes through the list of `Applications` found and inspects each
17-
for the the annotation `argocd-image-updater.argoproj.io/image-list`. This
17+
for the annotation `argocd-image-updater.argoproj.io/image-list`. This
1818
annotation holds a list of image names that should be updated, and is a
1919
mandatory annotation for Argo CD Image Updater to indicate it should
2020
process this `Application`. Read more about the syntax expected in this

docs/configuration/images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ following:
3232
argocd-image-updater.argoproj.io/image-list: nginx
3333
```
3434

35-
The above example would specify to update the image `nginx` to it's most recent
35+
The above example would specify to update the image `nginx` to its most recent
3636
version found in the container registry, without taking any version constraints
3737
into consideration.
3838

docs/install/installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ kubectl -n argocd-image-updater rollout restart deployment argocd-image-updater
165165

166166
When installed from the manifests into a Kubernetes cluster, the Argo CD Image
167167
Updater reads the token required for accessing Argo CD API from an environment
168-
variable named `ARGOCD_TOKEN`, which is set from a a field named
168+
variable named `ARGOCD_TOKEN`, which is set from a field named
169169
`argocd.token` in a secret named `argocd-image-updater-secret`.
170170

171171
The value for `argocd.token` should be set to the *base64 encoded* value of the
172-
access token you have generated above. As a short-cut, you can use generate the
172+
access token you have generated above. As a short-cut, you can use generate
173173
secret with `kubectl` and apply it over the existing resource:
174174

175175
```shell

go.mod

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

55
require (
6-
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20250421211119-90959ebfd519
6+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20250624020913-398db53f47e4
77
github.com/argoproj/argo-cd/v2 v2.13.8
88
github.com/argoproj/gitops-engine v0.7.1-0.20250129155113-4c6e03c46314
99
github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e
1010
github.com/bmatcuk/doublestar/v4 v4.8.1
1111
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0
1212
github.com/distribution/distribution/v3 v3.0.0-20230722181636-7b502560cad4
13-
github.com/go-git/go-git/v5 v5.16.0
13+
github.com/go-git/go-git/v5 v5.16.2
1414
github.com/google/uuid v1.6.0
1515
github.com/patrickmn/go-cache v2.1.0+incompatible
1616
github.com/prometheus/client_golang v1.22.0
@@ -19,17 +19,17 @@ require (
1919
github.com/spf13/pflag v1.0.6
2020
github.com/stretchr/testify v1.10.0
2121
go.uber.org/ratelimit v0.3.1
22-
golang.org/x/crypto v0.38.0
22+
golang.org/x/crypto v0.39.0
2323
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
24-
golang.org/x/oauth2 v0.29.0
25-
golang.org/x/sync v0.14.0
24+
golang.org/x/oauth2 v0.30.0
25+
golang.org/x/sync v0.15.0
2626
google.golang.org/grpc v1.72.0
2727
k8s.io/api v0.32.2
2828
k8s.io/apimachinery v0.32.2
2929
k8s.io/client-go v0.32.2
30-
sigs.k8s.io/kustomize/api v0.18.0
31-
sigs.k8s.io/kustomize/kyaml v0.18.1
32-
sigs.k8s.io/yaml v1.4.0
30+
sigs.k8s.io/kustomize/api v0.20.0
31+
sigs.k8s.io/kustomize/kyaml v0.20.0
32+
sigs.k8s.io/yaml v1.5.0
3333
)
3434

3535
require (
@@ -44,6 +44,7 @@ require (
4444
github.com/beorn7/perks v1.0.1 // indirect
4545
github.com/blang/semver/v4 v4.0.0 // indirect
4646
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
47+
github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
4748
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4849
github.com/chai2010/gettext-go v1.0.2 // indirect
4950
github.com/cloudflare/circl v1.6.1 // indirect
@@ -78,12 +79,11 @@ require (
7879
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7980
github.com/golang/protobuf v1.5.4 // indirect
8081
github.com/google/btree v1.1.3 // indirect
81-
github.com/google/gnostic-models v0.6.8 // indirect
82+
github.com/google/gnostic-models v0.6.9 // indirect
8283
github.com/google/go-cmp v0.7.0 // indirect
8384
github.com/google/go-github/v72 v72.0.0 // indirect
8485
github.com/google/go-querystring v1.1.0 // indirect
8586
github.com/google/gofuzz v1.2.0 // indirect
86-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8787
github.com/gorilla/mux v1.8.0 // indirect
8888
github.com/gorilla/websocket v1.5.3 // indirect
8989
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -137,10 +137,12 @@ require (
137137
go.opentelemetry.io/otel v1.34.0 // indirect
138138
go.opentelemetry.io/otel/metric v1.34.0 // indirect
139139
go.opentelemetry.io/otel/trace v1.34.0 // indirect
140+
go.yaml.in/yaml/v2 v2.4.2 // indirect
141+
go.yaml.in/yaml/v3 v3.0.3 // indirect
140142
golang.org/x/net v0.39.0 // indirect
141143
golang.org/x/sys v0.33.0 // indirect
142144
golang.org/x/term v0.32.0 // indirect
143-
golang.org/x/text v0.25.0 // indirect
145+
golang.org/x/text v0.26.0 // indirect
144146
golang.org/x/time v0.7.0 // indirect
145147
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
146148
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
@@ -159,7 +161,7 @@ require (
159161
k8s.io/controller-manager v0.0.0 // indirect
160162
k8s.io/klog/v2 v2.130.1 // indirect
161163
k8s.io/kube-aggregator v0.32.2 // indirect
162-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
164+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
163165
k8s.io/kubectl v0.32.2 // indirect
164166
k8s.io/kubernetes v1.32.2 // indirect
165167
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

0 commit comments

Comments
 (0)