Merge branch 'master' into patch-1

Signed-off-by: Kazimieras Gurskas <[email protected]>

Author: jannfis

.github/workflows/ci-tests.yaml

@@ -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
@@ -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
@@ -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
@@ -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

.golangci.yml

@@ -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/

Dockerfile

@@ -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
@@ -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

docs/basics/update.md

@@ -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.
 

docs/configuration/images.md

@@ -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`.
 

docs/install/installation.md

@@ -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
 

docs/requirements.txt

@@ -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