diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e4a575ddc0e..e7f67fa0892 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/cmd/main.go b/cmd/main.go index c7b7d240a7e..1cc7d76805b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -58,6 +58,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/webhook" + "github.com/argoproj-labs/argocd-operator/controllers/argoutil" pipelinesv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1" "github.com/redhat-developer/gitops-operator/common" "github.com/redhat-developer/gitops-operator/controllers" @@ -231,6 +232,7 @@ func main() { LocalUsers: &argocdprovisioner.LocalUsersInfo{ TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{}, }, + FipsConfigChecker: argoutil.NewLinuxFipsConfigChecker(), }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "Argo CD") os.Exit(1) diff --git a/go.mod b/go.mod index 2df33e71936..1c5235ad673 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ 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.20250828161935-75b2e086ba21 - github.com/argoproj/argo-cd/v3 v3.1.1 - github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 + github.com/argoproj-labs/argocd-operator v0.16.0-rc1 + github.com/argoproj/argo-cd/v3 v3.1.5 + github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-version v1.7.0 diff --git a/go.sum b/go.sum index 1364b8e3f59..d29f07e23a9 100644 --- a/go.sum +++ b/go.sum @@ -31,12 +31,12 @@ 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.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-labs/argocd-operator v0.16.0-rc1 h1:R/SA9ndrhClvVdfWwUO+/g9D7LKOAMk4slRTKUVqRF8= +github.com/argoproj-labs/argocd-operator v0.16.0-rc1/go.mod h1:zjKOjgm9Te6N++SSNO/Dmbh7BifSK6dfDNJzfrvzi+g= +github.com/argoproj/argo-cd/v3 v3.1.5 h1:dm1SY5CaILDIQIQINA4H6uJrXpExyif2Yz5915g91kQ= +github.com/argoproj/argo-cd/v3 v3.1.5/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo= +github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4= +github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5/go.mod h1:ebVOzFJphdN1p6EG2mIMECv/3Rk/almSaxIYuFAmsSw= github.com/argoproj/pkg/v2 v2.0.1 h1:O/gCETzB/3+/hyFL/7d/VM/6pSOIRWIiBOTb2xqAHvc= @@ -124,8 +124,8 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= github.com/go-git/go-git/v5 v5.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM= github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8= -github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY= -github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw= +github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI= +github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 78e94068750..bd422192d94 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 4c04f589f35..bf3f5624f77 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,21 +86,21 @@ 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.5" 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 { // when running against RC/ released version of gitops - expected_dexVersion = "v2.41.1" - expected_redisVersion = "7.2.7" + expected_dexVersion = "v2.43.0" + expected_redisVersion = "7.2.10" } By("locating pods containing toolchain in openshift-gitops")