Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
jannfis authored Jun 7, 2024
2 parents 929a82f + f8b345b commit 5ea8b26
Show file tree
Hide file tree
Showing 25 changed files with 1,885 additions and 1,778 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/ci-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.22'
- name: Download all Go modules
run: |
go mod download
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Kustomize v2
run: |
set -xo pipefail
Expand All @@ -58,11 +58,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Golang
uses: actions/setup-go@v4
with:
go-version: '1.22'
cache: false
env:
GO111MODULE: off
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v5
with:
version: v1.52.2
version: v1.57.2
args: --timeout 5m
test:
name: Ensure unit tests are passing
Expand All @@ -73,7 +80,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.22'
- name: Run tests
env:
GNUPG_DISABLED: true
Expand Down
13 changes: 6 additions & 7 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
run:
timeout: 2m
skip-files:
- ".*\\.pb\\.go"
skip-dirs:
- vendor/
linters:
enable:
- gofmt
- vet
- goimports
- ineffassign
- unconvert
- unparam
- unused
linters-settings:
goimports:
local-prefixes: github.com/argoproj-labs/argocd-image-updater
service:
golangci-lint-version: 1.52.2
issues:
exclude-files:
- ".*\\.pb\\.go"
exclude-dirs:
- vendor/
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 AS builder
FROM golang:1.22 AS builder

RUN mkdir -p /src/argocd-image-updater
WORKDIR /src/argocd-image-updater
Expand All @@ -10,13 +10,11 @@ COPY . .
RUN mkdir -p dist && \
make controller

FROM alpine:latest
FROM alpine:3.19

RUN apk update && \
apk upgrade && \
apk add ca-certificates git openssh-client python3 py3-pip tini && \
pip3 install --upgrade pip && \
pip3 install awscli && \
apk add ca-certificates git openssh-client aws-cli tini && \
rm -rf /var/cache/apk/*

RUN mkdir -p /usr/local/bin
Expand Down
4 changes: 2 additions & 2 deletions docs/basics/update.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ The workflow of Argo CD Image Updater can be described as follows:
* If Argo CD Image Updater considers an image from the list eligible for an
update check, it will connect the corresponding container registry to see
if there is a newer version of the image according to the
[update strategy](../update-strategies/)
[update strategy](../basics/update-strategies.md)
and other constraints that may have been configured for the image (e.g.
a list of tags that are allowed to consider).

* If a newer version of an image was found, Argo CD Image Updater will try
to update the image according to the configured
[update method](../update-methods/). Please note that Argo CD Image Updater will
[update method](../basics/update-methods.md). Please note that Argo CD Image Updater will
never update your manifests, instead it re-configures your Application
sources to use the new image tag, and control is handed over to Argo CD.

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

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

### Apply the installation manifests

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mkdocs==1.2.3
mkdocs-material==7.1.7
markdown_include==0.6.0
pygments==2.7.4
pygments==2.15.0
jinja2==3.0.3
Loading

0 comments on commit 5ea8b26

Please sign in to comment.