Skip to content

fix: Fips ssh fix #980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
svghadi merged 2 commits into from
Oct 1, 2025
+20 −18
Merged

fix: Fips ssh fix #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15aecab
Fips ssh fix
svghadi Oct 1, 2025
a065da3
Update argocd version in toolchain test
svghadi Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: builder
namespace: ocp
tag: rhel-9-golang-1.24-openshift-4.20
name: openshift-gitops-go-toolset
namespace: ci
tag: 1.24.6
8 changes: 5 additions & 3 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion openshift-ci/build-root/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down