From 2b26c0ec45b809d36a343dc257488af471f2e936 Mon Sep 17 00:00:00 2001 From: Cheng Fang Date: Thu, 8 Oct 2026 16:03:16 -0400 Subject: [PATCH 1/3] chore(deps): bump argocd from 3.5.2 to 3.5.4 and image updater from 1.3.0 to 1.3.1 Signed-off-by: Cheng Fang --- go.mod | 12 ++++++------ go.sum | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index a6290570c7c..cadbf74073d 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.0 + github.com/argoproj-labs/argocd-image-updater v1.3.1 github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20260923113038-06db8de0cedf 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 @@ -219,11 +219,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 ae053d3ed98..45f385d4f74 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.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/argocd-operator v0.20.0-rc1.0.20260923113038-06db8de0cedf h1:6S4RDnRuKcspjsmZtSW3CAfjnMU/JmknFJnOK/Vqoeo= github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20260923113038-06db8de0cedf/go.mod h1:a5QbpV5CWplHV3m194Zl1Lq4TOQvbnSUsC+5xLfCZls= 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= From 2fc5c8cd26be80621a96d2c0bf64d02dbc5158f4 Mon Sep 17 00:00:00 2001 From: Siddhesh Ghadi Date: Mon, 12 Oct 2026 18:52:32 +0530 Subject: [PATCH 2/3] Bump argocd operator commit Signed-off-by: Siddhesh Ghadi --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cadbf74073d..2546b75b5d5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ 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-operator v0.20.0-rc1.0.20260923113038-06db8de0cedf + 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.4 diff --git a/go.sum b/go.sum index 45f385d4f74..cba830fb334 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e56 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-operator v0.20.0-rc1.0.20260923113038-06db8de0cedf h1:6S4RDnRuKcspjsmZtSW3CAfjnMU/JmknFJnOK/Vqoeo= -github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20260923113038-06db8de0cedf/go.mod h1:a5QbpV5CWplHV3m194Zl1Lq4TOQvbnSUsC+5xLfCZls= +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= From c9ef4042a9a64d4196f3dc903183d673c0d24f7b Mon Sep 17 00:00:00 2001 From: Siddhesh Ghadi Date: Mon, 12 Oct 2026 23:19:11 +0530 Subject: [PATCH 3/3] fix(e2e): handle PROMOTER_EXTENSION_IMAGE override in 1-134 test On OCP CI the operator subscription sets PROMOTER_EXTENSION_IMAGE to a registry.redhat.io image, which the operator uses instead of the default quay.io image and omits the EXTENSION_URL env var. The test hardcoded both expectations to the defaults, causing it to fail in CI. Now the test reads PROMOTER_EXTENSION_IMAGE from the operator subscription or deployment and falls back to the default; the EXTENSION_URL env check is skipped when the image was overridden, matching the operator's logic. Co-Authored-By: Claude Sonnet 4.6 --- .../1-134_validate_gitops_promoter_test.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go b/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go index f8d66cb12fd..d14a929ba4d 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go @@ -422,11 +422,19 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { initContainer := deploymentFixture.GetTemplateSpecInitContainerByName("promoter-extension", *argoCDServer) Expect(initContainer).ToNot(BeNil()) - Expect(initContainer.Image).To(Equal(common.ArgoCDExtensionInstallerImage)) + // On OCP CI the operator subscription may override PROMOTER_EXTENSION_IMAGE with a registry.redhat.io image. + // When the image is overridden the operator does not set EXTENSION_URL, so we must handle both cases. + expectedImage := common.ArgoCDExtensionInstallerImage + if imageFromEnv, err := fixture.GetEnvInOperatorSubscriptionOrDeployment(common.ArgoCDPromoterExtensionImageEnvName); err == nil && imageFromEnv != nil { + expectedImage = *imageFromEnv + } + Expect(initContainer.Image).To(Equal(expectedImage)) - Expect(initContainer.Env).To(Equal([]corev1.EnvVar{ - {Name: "EXTENSION_URL", Value: common.GitopsPromoterExtensionURL}, - })) + if expectedImage == common.ArgoCDExtensionInstallerImage { + Expect(initContainer.Env).To(Equal([]corev1.EnvVar{ + {Name: "EXTENSION_URL", Value: common.GitopsPromoterExtensionURL}, + })) + } By("verify that argocd-server gets the extension volume") container := deploymentFixture.GetTemplateSpecContainerByName("argocd-server", *argoCDServer)