Skip to content

Commit 569a706

Browse files
svghadisvghadi
authored
Latest Argo CD operator version with FIPS fix (redhat-developer#971)
* Latest Argo CD operator version with FIPS fix Signed-off-by: Siddhesh Ghadi <[email protected]> * Update dex version in test Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]>
1 parent baf6650 commit 569a706

File tree

6 files changed

+22
-20
lines changed

6 files changed

+22
-20
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import (
5858
"sigs.k8s.io/controller-runtime/pkg/manager"
5959
"sigs.k8s.io/controller-runtime/pkg/webhook"
6060

61+
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
6162
pipelinesv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1"
6263
"github.com/redhat-developer/gitops-operator/common"
6364
"github.com/redhat-developer/gitops-operator/controllers"
@@ -231,6 +232,7 @@ func main() {
231232
LocalUsers: &argocdprovisioner.LocalUsersInfo{
232233
TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{},
233234
},
235+
FipsConfigChecker: argoutil.NewLinuxFipsConfigChecker(),
234236
}).SetupWithManager(mgr); err != nil {
235237
setupLog.Error(err, "unable to create controller", "controller", "Argo CD")
236238
os.Exit(1)

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.24.6
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8
7-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21
8-
github.com/argoproj/argo-cd/v3 v3.1.1
9-
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58
7+
github.com/argoproj-labs/argocd-operator v0.16.0-rc1
8+
github.com/argoproj/argo-cd/v3 v3.1.5
9+
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec
1010
github.com/go-logr/logr v1.4.3
1111
github.com/google/go-cmp v0.7.0
1212
github.com/hashicorp/go-version v1.7.0

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
3131
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
3232
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 h1:6+eo7BKrNkSIhQ1nnyCUloSNrGzghlb8r8e7GokoeBo=
3333
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc=
34-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21 h1:3hrm9AsOV10mEKS7E7GRbpI4Zb391lw11wGM+/2hh7g=
35-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21/go.mod h1:fhN/hOiIuSANIgYxF3sxjVfTbj7MR9pkp73om6zYKMA=
36-
github.com/argoproj/argo-cd/v3 v3.1.1 h1:5qzZUtfpHTwrySprpQwpvjPUHKUz7gBs/wK7PSiVQ8I=
37-
github.com/argoproj/argo-cd/v3 v3.1.1/go.mod h1:QqvzXzddclRLN7m9XrMb1SM6rOTFP9druSh7wrapZbw=
38-
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 h1:9ESamu44v3dR9j/I4/4Aa1Fx3QSIE8ElK1CR8Z285uk=
39-
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw=
34+
github.com/argoproj-labs/argocd-operator v0.16.0-rc1 h1:R/SA9ndrhClvVdfWwUO+/g9D7LKOAMk4slRTKUVqRF8=
35+
github.com/argoproj-labs/argocd-operator v0.16.0-rc1/go.mod h1:zjKOjgm9Te6N++SSNO/Dmbh7BifSK6dfDNJzfrvzi+g=
36+
github.com/argoproj/argo-cd/v3 v3.1.5 h1:dm1SY5CaILDIQIQINA4H6uJrXpExyif2Yz5915g91kQ=
37+
github.com/argoproj/argo-cd/v3 v3.1.5/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
38+
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4=
39+
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw=
4040
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=
4141
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5/go.mod h1:ebVOzFJphdN1p6EG2mIMECv/3Rk/almSaxIYuFAmsSw=
4242
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
124124
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
125125
github.com/go-git/go-git/v5 v5.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM=
126126
github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
127-
github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY=
128-
github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw=
127+
github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI=
128+
github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo=
129129
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
130130
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
131131
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,21 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
8686

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.7.0"
89-
expected_helmVersion := "v3.18.3"
90-
expected_argocdVersion := "v3.1.0"
89+
expected_helmVersion := "v3.18.4"
90+
expected_argocdVersion := "v3.1.5"
9191

9292
var expected_dexVersion string
9393
var expected_redisVersion string
9494

9595
if os.Getenv("CI") == "prow" {
9696
// when running against openshift-ci
97-
expected_dexVersion = "v2.30.3-dirty"
97+
expected_dexVersion = "v2.43.0"
9898
expected_redisVersion = "7.2.7"
9999

100100
} else {
101101
// when running against RC/ released version of gitops
102-
expected_dexVersion = "v2.41.1"
103-
expected_redisVersion = "7.2.7"
102+
expected_dexVersion = "v2.43.0"
103+
expected_redisVersion = "7.2.10"
104104
}
105105

106106
By("locating pods containing toolchain in openshift-gitops")

0 commit comments

Comments
 (0)