summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci-tests.yaml11
-rw-r--r--.golangci.yml11
-rw-r--r--Dockerfile4
-rw-r--r--docs/basics/update.md4
-rw-r--r--pkg/argocd/update.go2
5 files changed, 18 insertions, 14 deletions
diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml
index 831f2f4..e345f4c 100644
--- a/.github/workflows/ci-tests.yaml
+++ b/.github/workflows/ci-tests.yaml
@@ -59,10 +59,17 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
+ - name: Setup Golang
+ uses: actions/setup-go@v4
+ with:
+ go-version: '1.20'
+ 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
diff --git a/.golangci.yml b/.golangci.yml
index 599f38d..8deb3d7 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,9 +1,5 @@
run:
timeout: 2m
- skip-files:
- - ".*\\.pb\\.go"
- skip-dirs:
- - vendor/
linters:
enable:
- vet
@@ -15,5 +11,8 @@ linters:
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/
diff --git a/Dockerfile b/Dockerfile
index c374bae..df43be2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,7 @@ FROM alpine:latest
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
diff --git a/docs/basics/update.md b/docs/basics/update.md
index 623debb..4a258a3 100644
--- a/docs/basics/update.md
+++ b/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.
diff --git a/pkg/argocd/update.go b/pkg/argocd/update.go
index 855bbdd..fd1463e 100644
--- a/pkg/argocd/update.go
+++ b/pkg/argocd/update.go
@@ -353,7 +353,7 @@ func UpdateApplication(updateConf *UpdateConfiguration, state *SyncIterationStat
}
}
} else {
- logCtx.Infof("Dry run - not commiting %d changes to application", result.NumImagesUpdated)
+ logCtx.Infof("Dry run - not committing %d changes to application", result.NumImagesUpdated)
}
}