From fd97923df279f4666b96dedf8418e87e9ab2dbaf Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Tue, 30 Sep 2025 09:48:23 -0400 Subject: [PATCH] chore: Update to latest argocd-operator commit Signed-off-by: Jonathan West --- .ci-operator.yaml | 6 +++--- go.mod | 6 +++--- go.sum | 8 ++++---- openshift-ci/build-root/Dockerfile | 2 +- .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e4a575ddc..e7f67fa08 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.20 \ No newline at end of file + name: openshift-gitops-go-toolset + namespace: ci + tag: 1.24.6 \ No newline at end of file diff --git a/go.mod b/go.mod index 069fd3940..dddf7cc05 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/redhat-developer/gitops-operator -go 1.24.4 +go 1.24.6 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 - github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250825094300-73f08c092df7 - github.com/argoproj/argo-cd/v3 v3.1.0-rc2 + github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21 + github.com/argoproj/argo-cd/v3 v3.1.1 github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 diff --git a/go.sum b/go.sum index 422c39816..1364b8e3f 100644 --- a/go.sum +++ b/go.sum @@ -31,10 +31,10 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 h1:6+eo7BKrNkSIhQ1nnyCUloSNrGzghlb8r8e7GokoeBo= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc= -github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250825094300-73f08c092df7 h1:Y7UmKUW707B7xVLjfnBVkQgM00Dmi7JOCxB9WZ092zE= -github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250825094300-73f08c092df7/go.mod h1:7zgj/iHFq1r1OZmLX9yxUAarttxnklMbqZb/63euXA8= -github.com/argoproj/argo-cd/v3 v3.1.0-rc2 h1:oT9whFw3tShGkW1WrHJReFkAJvmsgS2KGJkcRIFSnt8= -github.com/argoproj/argo-cd/v3 v3.1.0-rc2/go.mod h1:vrxw1sapzdI3nnkwRKP84cMTzYjOKP7XsEy5fW1FQgg= +github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21 h1:3hrm9AsOV10mEKS7E7GRbpI4Zb391lw11wGM+/2hh7g= +github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21/go.mod h1:fhN/hOiIuSANIgYxF3sxjVfTbj7MR9pkp73om6zYKMA= +github.com/argoproj/argo-cd/v3 v3.1.1 h1:5qzZUtfpHTwrySprpQwpvjPUHKUz7gBs/wK7PSiVQ8I= +github.com/argoproj/argo-cd/v3 v3.1.1/go.mod h1:QqvzXzddclRLN7m9XrMb1SM6rOTFP9druSh7wrapZbw= github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 h1:9ESamu44v3dR9j/I4/4Aa1Fx3QSIE8ElK1CR8Z285uk= github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q= diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 78e940687..bd422192d 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 +FROM quay.io/devtools_gitops/go-toolset:1.24.6 USER root ARG KUBECTL_KUTTL_VERSION=0.12.1 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 4c04f589f..c9ee8fb9c 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 @@ -86,15 +86,15 @@ 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.7.0" - expected_helmVersion := "v3.18.3" - expected_argocdVersion := "v3.1.0" + expected_helmVersion := "v3.18.4" + expected_argocdVersion := "v3.1.1" var expected_dexVersion string var expected_redisVersion string if os.Getenv("CI") == "prow" { // when running against openshift-ci - expected_dexVersion = "v2.30.3-dirty" + expected_dexVersion = "v2.43.0" expected_redisVersion = "7.2.7" } else {