From a1410ba9e4217db7dff24e17bce443730bdcd350 Mon Sep 17 00:00:00 2001 From: Cheng Fang Date: Mon, 26 Oct 2026 11:08:33 -0400 Subject: [PATCH 1/2] chore(deps): bump argocd from 3.5.5 to 3.5.6 and image updater from 1.3.1 to 1.3.2 Signed-off-by: Cheng Fang --- go.mod | 12 ++++++------ go.sum | 12 ++++++------ .../ginkgo/parallel/1-031_validate_toolchain_test.go | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index e279993c44b..1c5ca0483e2 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,11 @@ go 1.26.5 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e569d7f - github.com/argoproj-labs/argocd-image-updater v1.3.1 + github.com/argoproj-labs/argocd-image-updater v1.3.2 github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261011153353-a213c171036a 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.5 + github.com/argoproj/argo-cd/v3 v3.5.6 github.com/cert-manager/cert-manager v1.21.2 github.com/go-logr/logr v1.4.4 github.com/google/go-cmp v0.7.0 @@ -219,11 +219,11 @@ require ( ) replace ( - // v3.5.4 declares gitops-engine at a pseudo-version where go.mod + // v3.5.6 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.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 + // Downstream consumers must resolve it themselves; pin to the v3.5.6 commit. + github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261020182657-c2b1e3017e2c + // This replace block is from Argo CD v3.5.6 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 24554dddf2c..e10762ca8ed 100644 --- a/go.sum +++ b/go.sum @@ -41,16 +41,16 @@ 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.1 h1:iW9yzkjV4ReYKBSfmKW0y2ovseynTQT7NjyWeekZDuM= -github.com/argoproj-labs/argocd-image-updater v1.3.1/go.mod h1:9SuxztqVyTMEnRqQfT/f1GGcfKJ0I6VHEIFfSQpiG08= +github.com/argoproj-labs/argocd-image-updater v1.3.2 h1:eVTz1miyQAr3poRWgtvdrcFYXZnkuIesmfLmM6XWD+I= +github.com/argoproj-labs/argocd-image-updater v1.3.2/go.mod h1:gOhc+D61dl12CJbqIaOmRlV7S65kmHOJ+/TDyQEEjdA= github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261011153353-a213c171036a h1:Pawq+aq2DD4FxYIBaO5tE5sCnyQi3ZsG0GKMle3/hkI= github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261011153353-a213c171036a/go.mod h1:VbBtHhLKgJ9FqUk/T/WZW3M+TIraUD4VyonfKlQ1xNA= 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-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.5 h1:xm61p5jv4Bq36JWHympmszlzrji7mjLmVFttRp695uc= -github.com/argoproj/argo-cd/v3 v3.5.5/go.mod h1:LJTX+2yLfWvFCK7/wyg+f9KEQ92QBYLtsQiMJ1jEor0= +github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261020182657-c2b1e3017e2c h1:7sM2hqwIetM70/Xvv4ms7zk00LA7Pe9KCtPAql0zEZE= +github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261020182657-c2b1e3017e2c/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= +github.com/argoproj/argo-cd/v3 v3.5.6 h1:twzdsPiPufKLRtEqD1Jg3FqtuZmSHLTIxs7t6fSkjlk= +github.com/argoproj/argo-cd/v3 v3.5.6/go.mod h1:LJTX+2yLfWvFCK7/wyg+f9KEQ92QBYLtsQiMJ1jEor0= 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/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go index 49310010539..011a392abf7 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go @@ -96,14 +96,14 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { if os.Getenv("CI") == "prow" { // when running against openshift-ci - expected_argocdVersion = "v3.5.4" + expected_argocdVersion = "v3.5.6" expected_dexVersion = "v2.45.1" expected_redisVersion = "8.2.3" expected_kustomizeVersion = "v5.8.1" } else { // when running against RC/ released version of gitops - expected_argocdVersion = "v3.5.5" + expected_argocdVersion = "v3.5.6" expected_dexVersion = "v2.45.1" expected_redisVersion = "7.2.16" expected_kustomizeVersion = "v5.8.2" From ebd65341c57e9dddd48551e5e6fd167e92a897d1 Mon Sep 17 00:00:00 2001 From: Cheng Fang Date: Tue, 27 Oct 2026 15:04:50 -0400 Subject: [PATCH 2/2] keep expected_argocdVersion as 3.5.4 and 3.5.5 in 1-031_validate_toolchain_test Signed-off-by: Cheng Fang --- .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go index 011a392abf7..49310010539 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go @@ -96,14 +96,14 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { if os.Getenv("CI") == "prow" { // when running against openshift-ci - expected_argocdVersion = "v3.5.6" + expected_argocdVersion = "v3.5.4" expected_dexVersion = "v2.45.1" expected_redisVersion = "8.2.3" expected_kustomizeVersion = "v5.8.1" } else { // when running against RC/ released version of gitops - expected_argocdVersion = "v3.5.6" + expected_argocdVersion = "v3.5.5" expected_dexVersion = "v2.45.1" expected_redisVersion = "7.2.16" expected_kustomizeVersion = "v5.8.2"