Skip to content

Commit 516cce4

Browse files
svghadisvghadi
authored
fix: Fips ssh fix (#980)
* Fips ssh fix Signed-off-by: Siddhesh Ghadi <[email protected]> * Update argocd version in toolchain test Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]>
1 parent 7dffd12 commit 516cce4

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

‎.ci-operator.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
2-
name: builder
3-
namespace: ocp
4-
tag: rhel-9-golang-1.24-openshift-4.20
2+
name: openshift-gitops-go-toolset
3+
namespace: ci
4+
tag: 1.24.6

‎cmd/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import (
5959

6060
"github.com/argoproj-labs/argocd-operator/controllers/argocd"
6161

62+
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
6263
pipelinesv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1"
6364
"github.com/redhat-developer/gitops-operator/common"
6465
"github.com/redhat-developer/gitops-operator/controllers"
@@ -217,9 +218,10 @@ func main() {
217218
setupLog.Info(fmt.Sprintf("Watching label-selector \"%s\"", labelSelectorFlag))
218219

219220
if err = (&argocdprovisioner.ReconcileArgoCD{
220-
Client: mgr.GetClient(),
221-
Scheme: mgr.GetScheme(),
222-
LabelSelector: labelSelectorFlag,
221+
Client: mgr.GetClient(),
222+
Scheme: mgr.GetScheme(),
223+
LabelSelector: labelSelectorFlag,
224+
FipsConfigChecker: argoutil.NewLinuxFipsConfigChecker(),
223225
}).SetupWithManager(mgr); err != nil {
224226
setupLog.Error(err, "unable to create controller", "controller", "Argo CD")
225227
os.Exit(1)

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/redhat-developer/gitops-operator
22

3-
go 1.24.4
3+
go 1.24.6
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250625125608-ebd6207c8bb1
7-
github.com/argoproj-labs/argocd-operator v0.15.0-rc1.0.20250806035040-d11fbb89eedb
8-
github.com/argoproj/argo-cd/v3 v3.0.11
9-
github.com/argoproj/gitops-engine v0.7.1-0.20250520182409-89c110b5952e
7+
github.com/argoproj-labs/argocd-operator v0.15.1-0.20250917132720-54688324857f
8+
github.com/argoproj/argo-cd/v3 v3.0.16
9+
github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4
1010
github.com/go-logr/logr v1.4.2
1111
github.com/google/go-cmp v0.7.0
1212
github.com/hashicorp/go-version v1.6.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
3535
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
3636
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250625125608-ebd6207c8bb1 h1:TjX3ZHPA3YOmoHZutzfvOQVKRO2Jt4JvDCPvI4VhWoA=
3737
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250625125608-ebd6207c8bb1/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc=
38-
github.com/argoproj-labs/argocd-operator v0.15.0-rc1.0.20250806035040-d11fbb89eedb h1:nP5aDIfwZZKSgaorp5BlNphfSQyvv8x4EzFAlyR+de0=
39-
github.com/argoproj-labs/argocd-operator v0.15.0-rc1.0.20250806035040-d11fbb89eedb/go.mod h1:6rbhhiij9sAuSkUjNrSIcn83lgEc7w0huuImaARS7uA=
40-
github.com/argoproj/argo-cd/v3 v3.0.11 h1:TAqk/GEBLevlxmBCR6kSR+fCLRInPic+n8qGg+FvcR4=
41-
github.com/argoproj/argo-cd/v3 v3.0.11/go.mod h1:ofadwxZACMBM+CGn+d0cytbqU4Xthj/pCjp2k2gekn4=
42-
github.com/argoproj/gitops-engine v0.7.1-0.20250520182409-89c110b5952e h1:65x5+7Vz3HPjFoj7+mFyCckgHrAhPwy4rnDp/AveD18=
43-
github.com/argoproj/gitops-engine v0.7.1-0.20250520182409-89c110b5952e/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ=
38+
github.com/argoproj-labs/argocd-operator v0.15.1-0.20250917132720-54688324857f h1:ApN0wzCPsoo3ZGGC2/8UwBgMOSqv/QB+TKQoji3cxeo=
39+
github.com/argoproj-labs/argocd-operator v0.15.1-0.20250917132720-54688324857f/go.mod h1:5jApqvt/B2NpI2fFEa7g/8TGUvnesspv86yu1E4hVUI=
40+
github.com/argoproj/argo-cd/v3 v3.0.16 h1:V67eJxuPTS20kjcA1K/uLnbapEVUfIJ9eIO62ns4ECU=
41+
github.com/argoproj/argo-cd/v3 v3.0.16/go.mod h1:oTCI5r+Hacij94yJto2/mVXAHB8r3375h9SInqbS8EM=
42+
github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4 h1:OsQxWX8UHdwXuy72Y1Js8gQY3xmOzFEieCSpMoXKFb8=
43+
github.com/argoproj/gitops-engine v0.7.1-0.20250905153922-d96c3d51e4c4/go.mod h1:duVhxDW7M7M7+19IBCVth2REOS11gmqzTWwj4u8N7aQ=
4444
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=
4545
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5/go.mod h1:ebVOzFJphdN1p6EG2mIMECv/3Rk/almSaxIYuFAmsSw=
4646
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

‎openshift-ci/build-root/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerfile to bootstrap build and test in openshift-ci
22

3-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
3+
FROM quay.io/devtools_gitops/go-toolset:1.24.6
44
USER root
55

66
ARG KUBECTL_KUTTL_VERSION=0.12.1

‎test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
8787
// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
8888
expected_kustomizeVersion := "v5.6.0"
8989
expected_helmVersion := "v3.17.1"
90-
expected_argocdVersion := "v3.0.11"
90+
expected_argocdVersion := "v3.0.16"
9191

9292
var expected_dexVersion string
9393
var expected_redisVersion string

0 commit comments

Comments
 (0)