Skip to content

Commit b86e898

Browse files
Merge branch 'master' of https://github.com/argoproj-labs/argocd-image-updater into fix/set-default-image-alias-with-helmvalues
2 parents 43afe23 + bb590d5 commit b86e898

File tree

21 files changed

+1747
-1743
lines changed

21 files changed

+1747
-1743
lines changed

.github/workflows/ci-tests.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
- name: Setup Golang
19-
uses: actions/setup-go@v3
19+
uses: actions/setup-go@v4
2020
with:
21-
go-version: '1.20'
21+
go-version: '1.22'
2222
- name: Download all Go modules
2323
run: |
2424
go mod download
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout code
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535
- name: Install Kustomize v2
3636
run: |
3737
set -xo pipefail
@@ -58,11 +58,11 @@ jobs:
5858
runs-on: ubuntu-latest
5959
steps:
6060
- name: Checkout code
61-
uses: actions/checkout@v3
61+
uses: actions/checkout@v4
6262
- name: Setup Golang
6363
uses: actions/setup-go@v4
6464
with:
65-
go-version: '1.20'
65+
go-version: '1.22'
6666
cache: false
6767
env:
6868
GO111MODULE: off
@@ -80,7 +80,7 @@ jobs:
8080
- name: Setup Golang
8181
uses: actions/setup-go@v3
8282
with:
83-
go-version: '1.20'
83+
go-version: '1.22'
8484
- name: Run tests
8585
env:
8686
GNUPG_DISABLED: true

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ run:
22
timeout: 2m
33
linters:
44
enable:
5+
- gofmt
56
- vet
67
- goimports
78
- ineffassign
89
- unconvert
9-
- unparam
1010
- unused
1111
linters-settings:
1212
goimports:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20 AS builder
1+
FROM golang:1.22 AS builder
22

33
RUN mkdir -p /src/argocd-image-updater
44
WORKDIR /src/argocd-image-updater
@@ -10,7 +10,7 @@ COPY . .
1010
RUN mkdir -p dist && \
1111
make controller
1212

13-
FROM alpine:latest
13+
FROM alpine:3.19
1414

1515
RUN apk update && \
1616
apk upgrade && \

docs/configuration/images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The alias you assign to any image will be reused as a key in the annotations
102102
used to define further options, so a little care should be taken when defining
103103
such a name. It's generally advised to use only alpha-numerical characters. The
104104
character `/` (forward-slash) can be used in the name, but must be referenced
105-
as `_` (underscore) in the annotation. This is a limit of Kubernetes. So for
105+
as `_` (underscore) in the annotation. This is a limitation of Kubernetes. So for
106106
example, if you assign the alias `argoproj/argocd` to your image, the
107107
appropriate key in the annotation would be referenced as `argoproj_argocd`.
108108

docs/install/installation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Argo CD is running. Don't worry, without any configuration, it will not start me
1919
We also provide a Kustomize base in addition to the plain Kubernetes YAML
2020
manifests. You can use it as remote base and create overlays with your
2121
configuration on top of it. The remote base's URL is
22-
`https://github.com/argoproj-labs/argocd-image-updater/manifests/base`
22+
`https://github.com/argoproj-labs/argocd-image-updater/manifests/base`.
23+
You can view the manifests [here](https://github.com/argoproj-labs/argocd-image-updater/tree/stable/manifests/base)
2324

2425
### Apply the installation manifests
2526

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mkdocs==1.2.3
22
mkdocs-material==7.1.7
33
markdown_include==0.6.0
4-
pygments==2.7.4
4+
pygments==2.15.0
55
jinja2==3.0.3

0 commit comments

Comments
 (0)