From 053284c547226da3b58131531c4cf4e2f2e8293b Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Tue, 22 Oct 2024 11:07:25 +0530 Subject: [PATCH] update argocd version to 2.11.11 (#1569) * update argocd version to 2.11.11 Signed-off-by: Anand Kumar Singh * update go-lint version Signed-off-by: Anand Kumar Singh --------- Signed-off-by: Anand Kumar Singh --- .github/workflows/lint.yaml | 2 +- build/util/Dockerfile | 4 ++-- common/defaults.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 2cfac9f22..d005b48f4 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -14,7 +14,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Run golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: version: v1.56.2 args: --timeout 5m --exclude SA5011 diff --git a/build/util/Dockerfile b/build/util/Dockerfile index 75f9001f7..258c19c53 100644 --- a/build/util/Dockerfile +++ b/build/util/Dockerfile @@ -1,5 +1,5 @@ -# Argo CD v2.11.9 -FROM quay.io/argoproj/argocd@sha256:23f79b0e8cbbc1aefc15918a33fe8bcafa1aedc19554852acd12943ce0a577a2 as argocd +# Argo CD v2.11.11 +FROM quay.io/argoproj/argocd@sha256:f07b58355e244e9dfa0b4aa70475e3d06f4770ccc891a8c9365250a10198a655 as argocd # Final Image FROM docker.io/library/ubuntu:24.04 diff --git a/common/defaults.go b/common/defaults.go index 1d3afc094..5f9e8b5c8 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -64,7 +64,7 @@ const ( ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd" // ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified. - ArgoCDDefaultArgoVersion = "sha256:23f79b0e8cbbc1aefc15918a33fe8bcafa1aedc19554852acd12943ce0a577a2" // v2.11.9 + ArgoCDDefaultArgoVersion = "sha256:f07b58355e244e9dfa0b4aa70475e3d06f4770ccc891a8c9365250a10198a655" // v2.11.11 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 diff --git a/go.mod b/go.mod index 8e7d96904..e9755ca28 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/argoproj-labs/argocd-operator go 1.21 require ( - github.com/argoproj/argo-cd/v2 v2.11.9 + github.com/argoproj/argo-cd/v2 v2.11.11 github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.4.1 github.com/google/go-cmp v0.6.0 diff --git a/go.sum b/go.sum index 9c6f0fc23..855bcf6e6 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= -github.com/argoproj/argo-cd/v2 v2.11.9 h1:tk7jCH+HAqMLu4pWAndv6WGTocmuY1kVCGK1b8b2d1k= -github.com/argoproj/argo-cd/v2 v2.11.9/go.mod h1:RfmtLRki6JBwq9jkgCMie9MzfvYqs0DfzbuG3JcDrPk= +github.com/argoproj/argo-cd/v2 v2.11.11 h1:yA1my8AYYVTLiecC9cYkV9tdjuquM1Zqa0vy2eJNJ84= +github.com/argoproj/argo-cd/v2 v2.11.11/go.mod h1:WXdWCetNnx96Q51sFpTDC9hUOGxL5QlfjSJA2HCMJJc= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 h1:qsHwwOJ21K2Ao0xPju1sNuqphyMnMYkyB3ZLoLtxWpo= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1/go.mod h1:CZHlkyAD1/+FbEn6cB2DQTj48IoLGvEYsWEvtzP3238= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=