diff --git a/go.mod b/go.mod index 3131632fcce..9ce0b597d23 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ 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-operator v0.19.0-rc1.0.20260824193734-c354222740c1 + github.com/argoproj-labs/argocd-operator v0.19.0-rc1.0.20260903101506-65e1565dae0e 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.1 + github.com/argoproj/argo-cd/v3 v3.5.2 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.1 declares gitops-engine at a pseudo-version where go.mod + // v3.5.2 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.1 commit. - github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260812112440-109ca7ca7113 - // This replace block is from Argo CD v3.5.1 go.mod + // 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 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 d24f5e5ecaf..f9d78ba4f05 100644 --- a/go.sum +++ b/go.sum @@ -43,14 +43,14 @@ 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.0 h1:MFqUKURoh14wV1ansPGFnzLIvUGhzWOMU8L2x96041U= github.com/argoproj-labs/argocd-image-updater v1.3.0/go.mod h1:7h1LqHoKavqo8rofiSPnzMK55n77WrnwCLxtgOb3AtI= -github.com/argoproj-labs/argocd-operator v0.19.0-rc1.0.20260824193734-c354222740c1 h1:8oereBYBbvk8CAibLm387pR2P6An0UqTPVsmy5MT5Hg= -github.com/argoproj-labs/argocd-operator v0.19.0-rc1.0.20260824193734-c354222740c1/go.mod h1:bm/IUX9v7NrneEklwsn9R03ebpGKasOvxbziY4HEqnc= +github.com/argoproj-labs/argocd-operator v0.19.0-rc1.0.20260903101506-65e1565dae0e h1:cxMesXEtRgOW0j5CO3otBMSgeJ+h2GlhnGr4SkB4IcQ= +github.com/argoproj-labs/argocd-operator v0.19.0-rc1.0.20260903101506-65e1565dae0e/go.mod h1:SeW4a79vL2YxoDXnXrv9Qzc3UGcB3XHsbJfG028CaD4= 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-20260812112440-109ca7ca7113 h1:Datv/1guNla320d6ZaHTSaxB3bUVzO83NyeY6LaUjvM= -github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260812112440-109ca7ca7113/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= -github.com/argoproj/argo-cd/v3 v3.5.1 h1:jtwPLEFX9mNj3jSq88ugFcScGnOZVs2DWaXFuZxrRT8= -github.com/argoproj/argo-cd/v3 v3.5.1/go.mod h1:/248vUTcQHNW3fYkaSUc0PkCFA/+mnILl5b6rv+xG6Y= +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/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 8ed2807ab0e..268dc58dd8b 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 @@ -87,19 +87,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix expected_kustomizeVersion := "v5.8.1" expected_helmVersion := "v4.2.1" - expected_argocdVersion := "v3.5.1" + expected_argocdVersion := "v3.5.2" var expected_dexVersion string var expected_redisVersion string if os.Getenv("CI") == "prow" { // when running against openshift-ci - expected_dexVersion = "v2.45.0" + expected_dexVersion = "v2.45.1" expected_redisVersion = "8.2.3" } else { // when running against RC/ released version of gitops - expected_dexVersion = "v2.45.0" + expected_dexVersion = "v2.45.1" expected_redisVersion = "8.2.3" }