diff --git a/argocd-operator/Makefile b/argocd-operator/Makefile index b22dac719b8..46d4dbf2488 100644 --- a/argocd-operator/Makefile +++ b/argocd-operator/Makefile @@ -10,7 +10,7 @@ VERSION ?= 0.20.0 # After updating, call 'make update-dependencies'. # Notes: # - String should NOT begin with 'v' prefix, e.g. 'v3.1.1' -ARGO_CD_TARGET_VERSION ?= 3.5.2 +ARGO_CD_TARGET_VERSION ?= 3.5.4 # Try to detect Docker or Podman CONTAINER_RUNTIME := $(shell command -v docker 2> /dev/null || command -v podman 2> /dev/null) diff --git a/argocd-operator/build/util/Dockerfile b/argocd-operator/build/util/Dockerfile index 84bd8bb5bf7..38b05565730 100644 --- a/argocd-operator/build/util/Dockerfile +++ b/argocd-operator/build/util/Dockerfile @@ -1,5 +1,5 @@ -# Argo CD v3.5.2 -FROM quay.io/argoproj/argocd@sha256:e2aadfae709d904e87f46ba4aa49601d827b3022db22cd4d03aae816a2e7097b AS argocd +# Argo CD v3.5.4 +FROM quay.io/argoproj/argocd@sha256:49dff79439bb38b1b942b19a113fe1fec7e6b6c671ddf9fe6a4a7c46bde0b77b AS argocd # Final Image FROM docker.io/library/ubuntu:26.04 diff --git a/argocd-operator/common/defaults.go b/argocd-operator/common/defaults.go index 711c7325af9..31f61eed422 100644 --- a/argocd-operator/common/defaults.go +++ b/argocd-operator/common/defaults.go @@ -82,7 +82,7 @@ const ( ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd" // ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified. - ArgoCDDefaultArgoVersion = "sha256:e2aadfae709d904e87f46ba4aa49601d827b3022db22cd4d03aae816a2e7097b" // v3.5.2 + ArgoCDDefaultArgoVersion = "sha256:49dff79439bb38b1b942b19a113fe1fec7e6b6c671ddf9fe6a4a7c46bde0b77b" // v3.5.4 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 diff --git a/argocd-operator/controllers/argocd/image_updater.go b/argocd-operator/controllers/argocd/image_updater.go index 391cbf42f0f..2f1bfc38eb8 100644 --- a/argocd-operator/controllers/argocd/image_updater.go +++ b/argocd-operator/controllers/argocd/image_updater.go @@ -27,7 +27,7 @@ import ( const ( DefaultImageUpdaterImage = "quay.io/argoprojlabs/argocd-image-updater" - DefaultImageUpdaterTag = "v1.3.0" + DefaultImageUpdaterTag = "v1.3.1" ArgocdImageUpdaterConfigCM = "argocd-image-updater-config" ArgocdImageUpdaterSSHConfigCM = "argocd-image-updater-ssh-config" ArgocdImageUpdaterSecret = "argocd-image-updater-secret" // #nosec G101 diff --git a/argocd-operator/go.mod b/argocd-operator/go.mod index e8bc3faced5..8732da688c5 100644 --- a/argocd-operator/go.mod +++ b/argocd-operator/go.mod @@ -5,7 +5,7 @@ go 1.26.5 require ( github.com/argoproj/argo-cd/gitops-engine v0.7.1-0.20250908182407-97ad5b59a627 // Update in Makefile and run `make update-dependencies` - github.com/argoproj/argo-cd/v3 v3.5.2 + github.com/argoproj/argo-cd/v3 v3.5.4 github.com/cert-manager/cert-manager v1.20.3 github.com/go-logr/logr v1.4.4 github.com/google/go-cmp v0.7.0 @@ -85,7 +85,7 @@ require ( ) require ( - github.com/argoproj-labs/argocd-image-updater v1.3.0 + github.com/argoproj-labs/argocd-image-updater v1.3.1 go.yaml.in/yaml/v2 v2.4.4 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect ) @@ -223,11 +223,11 @@ require ( ) replace ( - // v3.5.2 declares gitops-engine at a pseudo-version where go.mod + // v3.5.4 declares gitops-engine at a pseudo-version where go.mod // didn't exist yet, then overrides with replace => ./gitops-engine locally. - // Downstream consumers must resolve it themselves; pin to the v3.5.2 commit. - github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260827090335-e258ee23c3e5 - // This replace block is from Argo CD v3.5.2 go.mod + // Downstream consumers must resolve it themselves; pin to the v3.5.4 commit. + github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261006195831-d6d5b248ce00 + // This replace block is from Argo CD v3.5.4 go.mod github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0 golang.org/x/tools => golang.org/x/tools v0.35.0 diff --git a/argocd-operator/go.sum b/argocd-operator/go.sum index 1565037f023..ce28bab6f3d 100644 --- a/argocd-operator/go.sum +++ b/argocd-operator/go.sum @@ -39,14 +39,14 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= -github.com/argoproj-labs/argocd-image-updater v1.3.0 h1:MFqUKURoh14wV1ansPGFnzLIvUGhzWOMU8L2x96041U= -github.com/argoproj-labs/argocd-image-updater v1.3.0/go.mod h1:7h1LqHoKavqo8rofiSPnzMK55n77WrnwCLxtgOb3AtI= +github.com/argoproj-labs/argocd-image-updater v1.3.1 h1:iW9yzkjV4ReYKBSfmKW0y2ovseynTQT7NjyWeekZDuM= +github.com/argoproj-labs/argocd-image-updater v1.3.1/go.mod h1:9SuxztqVyTMEnRqQfT/f1GGcfKJ0I6VHEIFfSQpiG08= github.com/argoproj-labs/gitops-promoter v0.35.0 h1:uma781gA0XW9Or0RuMnQFwe6ikZUAz/tmStRDSR44r4= github.com/argoproj-labs/gitops-promoter v0.35.0/go.mod h1:t6ndi4HS6lixaYyFpNALRQd8R34jbCXsZMxWvOT4dzk= -github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260827090335-e258ee23c3e5 h1:8vyBhWiaNxZrYw1jN1Qznp6xOWHUTisseNKUPEV+HXM= -github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260827090335-e258ee23c3e5/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= -github.com/argoproj/argo-cd/v3 v3.5.2 h1:vYtfW2pEBSL+smt8XdpVZHUg31uERINYH6eXzdiLCY4= -github.com/argoproj/argo-cd/v3 v3.5.2/go.mod h1:/248vUTcQHNW3fYkaSUc0PkCFA/+mnILl5b6rv+xG6Y= +github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261006195831-d6d5b248ce00 h1:6DG4qer3YofndcbHi8gIDcD0BA8xhH8uTiRviCMiwfc= +github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261006195831-d6d5b248ce00/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= +github.com/argoproj/argo-cd/v3 v3.5.4 h1:kngQVnz+M+ytW/urkUWTSh8+zI+Hi/XhLespL5roYK0= +github.com/argoproj/argo-cd/v3 v3.5.4/go.mod h1:/248vUTcQHNW3fYkaSUc0PkCFA/+mnILl5b6rv+xG6Y= github.com/argoproj/pkg/v2 v2.0.1 h1:O/gCETzB/3+/hyFL/7d/VM/6pSOIRWIiBOTb2xqAHvc= github.com/argoproj/pkg/v2 v2.0.1/go.mod h1:sdifF6sUTx9ifs38ZaiNMRJuMpSCBB9GulHfbPgQeRE= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= diff --git a/go.mod b/go.mod index 750a70848c0..1d4b8138949 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ replace github.com/argoproj-labs/gitops-operator/argocd-operator => ./argocd-ope require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e569d7f - github.com/argoproj-labs/argocd-image-updater v1.3.0 + github.com/argoproj-labs/argocd-image-updater v1.3.1 github.com/argoproj-labs/gitops-promoter v0.35.0 github.com/argoproj/argo-cd/gitops-engine v0.7.1-0.20250908182407-97ad5b59a627 - github.com/argoproj/argo-cd/v3 v3.5.2 + github.com/argoproj/argo-cd/v3 v3.5.4 github.com/cert-manager/cert-manager v1.20.3 github.com/go-logr/logr v1.4.4 github.com/google/go-cmp v0.7.0 @@ -223,11 +223,11 @@ require ( ) replace ( - // v3.5.2 declares gitops-engine at a pseudo-version where go.mod + // v3.5.4 declares gitops-engine at a pseudo-version where go.mod // didn't exist yet, then overrides with replace => ./gitops-engine locally. - // Downstream consumers must resolve it themselves; pin to the v3.5.2 commit. - github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260827090335-e258ee23c3e5 - // This replace block is from Argo CD v3.5.2 go.mod + // Downstream consumers must resolve it themselves; pin to the v3.5.4 commit. + github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261006195831-d6d5b248ce00 + // This replace block is from Argo CD v3.5.4 go.mod github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0 golang.org/x/tools => golang.org/x/tools v0.35.0 diff --git a/go.sum b/go.sum index 45188b83bce..cc98f66d59d 100644 --- a/go.sum +++ b/go.sum @@ -41,14 +41,14 @@ github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYW github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e569d7f h1:o2mJI8sIn+8u1ZmhVOh6hn8udX5sTqYwa1BwSKa30gQ= github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e569d7f/go.mod h1:P51MRErJxlueBd9YD/5yOxf2ygwCtMcKku7mPJfFagY= -github.com/argoproj-labs/argocd-image-updater v1.3.0 h1:MFqUKURoh14wV1ansPGFnzLIvUGhzWOMU8L2x96041U= -github.com/argoproj-labs/argocd-image-updater v1.3.0/go.mod h1:7h1LqHoKavqo8rofiSPnzMK55n77WrnwCLxtgOb3AtI= +github.com/argoproj-labs/argocd-image-updater v1.3.1 h1:iW9yzkjV4ReYKBSfmKW0y2ovseynTQT7NjyWeekZDuM= +github.com/argoproj-labs/argocd-image-updater v1.3.1/go.mod h1:9SuxztqVyTMEnRqQfT/f1GGcfKJ0I6VHEIFfSQpiG08= github.com/argoproj-labs/gitops-promoter v0.35.0 h1:uma781gA0XW9Or0RuMnQFwe6ikZUAz/tmStRDSR44r4= github.com/argoproj-labs/gitops-promoter v0.35.0/go.mod h1:t6ndi4HS6lixaYyFpNALRQd8R34jbCXsZMxWvOT4dzk= -github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260827090335-e258ee23c3e5 h1:8vyBhWiaNxZrYw1jN1Qznp6xOWHUTisseNKUPEV+HXM= -github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260827090335-e258ee23c3e5/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= -github.com/argoproj/argo-cd/v3 v3.5.2 h1:vYtfW2pEBSL+smt8XdpVZHUg31uERINYH6eXzdiLCY4= -github.com/argoproj/argo-cd/v3 v3.5.2/go.mod h1:/248vUTcQHNW3fYkaSUc0PkCFA/+mnILl5b6rv+xG6Y= +github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261006195831-d6d5b248ce00 h1:6DG4qer3YofndcbHi8gIDcD0BA8xhH8uTiRviCMiwfc= +github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261006195831-d6d5b248ce00/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= +github.com/argoproj/argo-cd/v3 v3.5.4 h1:kngQVnz+M+ytW/urkUWTSh8+zI+Hi/XhLespL5roYK0= +github.com/argoproj/argo-cd/v3 v3.5.4/go.mod h1:/248vUTcQHNW3fYkaSUc0PkCFA/+mnILl5b6rv+xG6Y= github.com/argoproj/pkg/v2 v2.0.1 h1:O/gCETzB/3+/hyFL/7d/VM/6pSOIRWIiBOTb2xqAHvc= github.com/argoproj/pkg/v2 v2.0.1/go.mod h1:sdifF6sUTx9ifs38ZaiNMRJuMpSCBB9GulHfbPgQeRE= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=