From 15aecab058dfec26a092191db8df7359fd134ab2 Mon Sep 17 00:00:00 2001 From: Siddhesh Ghadi Date: Wed, 1 Oct 2025 11:10:25 +0530 Subject: [PATCH 1/2] Fips ssh fix Signed-off-by: Siddhesh Ghadi --- .ci-operator.yaml | 6 +++--- cmd/main.go | 8 +++++--- go.mod | 8 ++++---- go.sum | 12 ++++++------ openshift-ci/build-root/Dockerfile | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) 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 e17cf467ee7..e9f57f9c50e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -59,6 +59,7 @@ import ( "github.com/argoproj-labs/argocd-operator/controllers/argocd" + "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" @@ -217,9 +218,10 @@ func main() { setupLog.Info(fmt.Sprintf("Watching label-selector \"%s\"", labelSelectorFlag)) if err = (&argocdprovisioner.ReconcileArgoCD{ - Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), - LabelSelector: labelSelectorFlag, + Client: mgr.GetClient(), + Scheme: mgr.GetScheme(), + LabelSelector: labelSelectorFlag, + 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 9128f9cf73b..6177e07a1a1 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ 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.20250625125608-ebd6207c8bb1 - github.com/argoproj-labs/argocd-operator v0.15.0-rc1.0.20250806035040-d11fbb89eedb - github.com/argoproj/argo-cd/v3 v3.0.11 - github.com/argoproj/gitops-engine v0.7.1-0.20250520182409-89c110b5952e + github.com/argoproj-labs/argocd-operator v0.15.1-0.20250917132720-54688324857f + github.com/argoproj/argo-cd/v3 v3.0.16 + github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-version v1.6.0 diff --git a/go.sum b/go.sum index 12017db00d7..744b6dc9901 100644 --- a/go.sum +++ b/go.sum @@ -35,12 +35,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.20250625125608-ebd6207c8bb1 h1:TjX3ZHPA3YOmoHZutzfvOQVKRO2Jt4JvDCPvI4VhWoA= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250625125608-ebd6207c8bb1/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc= -github.com/argoproj-labs/argocd-operator v0.15.0-rc1.0.20250806035040-d11fbb89eedb h1:nP5aDIfwZZKSgaorp5BlNphfSQyvv8x4EzFAlyR+de0= -github.com/argoproj-labs/argocd-operator v0.15.0-rc1.0.20250806035040-d11fbb89eedb/go.mod h1:6rbhhiij9sAuSkUjNrSIcn83lgEc7w0huuImaARS7uA= -github.com/argoproj/argo-cd/v3 v3.0.11 h1:TAqk/GEBLevlxmBCR6kSR+fCLRInPic+n8qGg+FvcR4= -github.com/argoproj/argo-cd/v3 v3.0.11/go.mod h1:ofadwxZACMBM+CGn+d0cytbqU4Xthj/pCjp2k2gekn4= -github.com/argoproj/gitops-engine v0.7.1-0.20250520182409-89c110b5952e h1:65x5+7Vz3HPjFoj7+mFyCckgHrAhPwy4rnDp/AveD18= -github.com/argoproj/gitops-engine v0.7.1-0.20250520182409-89c110b5952e/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ= +github.com/argoproj-labs/argocd-operator v0.15.1-0.20250917132720-54688324857f h1:ApN0wzCPsoo3ZGGC2/8UwBgMOSqv/QB+TKQoji3cxeo= +github.com/argoproj-labs/argocd-operator v0.15.1-0.20250917132720-54688324857f/go.mod h1:5jApqvt/B2NpI2fFEa7g/8TGUvnesspv86yu1E4hVUI= +github.com/argoproj/argo-cd/v3 v3.0.16 h1:V67eJxuPTS20kjcA1K/uLnbapEVUfIJ9eIO62ns4ECU= +github.com/argoproj/argo-cd/v3 v3.0.16/go.mod h1:oTCI5r+Hacij94yJto2/mVXAHB8r3375h9SInqbS8EM= +github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 h1:OsQxWX8UHdwXuy72Y1Js8gQY3xmOzFEieCSpMoXKFb8= +github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ= 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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= 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 From a065da37d278287d5ddd0a85d4199635cf5f7bd2 Mon Sep 17 00:00:00 2001 From: Siddhesh Ghadi Date: Wed, 1 Oct 2025 16:51:23 +0530 Subject: [PATCH 2/2] Update argocd version in toolchain test Signed-off-by: Siddhesh Ghadi --- .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cdab38b67a0..6a23e9b9aba 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,7 +87,7 @@ 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.6.0" expected_helmVersion := "v3.17.1" - expected_argocdVersion := "v3.0.11" + expected_argocdVersion := "v3.0.16" var expected_dexVersion string var expected_redisVersion string