Skip to content

Commit f09d22c

Browse files
Rizwana777svghadi
Rizwana777
and
svghadi
authored
Update argocd-operator to latest commit from release-0.18 (#1146)
* Update argocd-operator to latest commit from release-0.18 Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com> * Use latest commit ref Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> --------- Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com> Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> Co-authored-by: Siddhesh Ghadi <sghadi1203@gmail.com>
1 parent 894a31c commit f09d22c

8 files changed

Lines changed: 27 additions & 31 deletions

File tree

‎.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: openshift-gitops-go-toolset
33
namespace: ci
4-
tag: 1.25.5
4+
tag: 1.25.9

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,6 @@ spec:
19051905
NetworkPolicy resources for this Argo CD instance.
19061906
properties:
19071907
enabled:
1908-
default: true
19091908
description: |-
19101909
Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance.
19111910
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
@@ -18031,7 +18030,6 @@ spec:
1803118030
NetworkPolicy resources for this Argo CD instance.
1803218031
properties:
1803318032
enabled:
18034-
default: true
1803518033
description: |-
1803618034
Enabled defines whether NetworkPolicy resources are created for this Argo CD instance.
1803718035
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.

‎bundle/manifests/gitops-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ metadata:
180180
capabilities: Deep Insights
181181
console.openshift.io/plugins: '["gitops-plugin"]'
182182
containerImage: quay.io/redhat-developer/gitops-operator
183-
createdAt: "2026-03-04T06:59:29Z"
183+
createdAt: "2026-05-20T03:47:13Z"
184184
description: Enables teams to adopt GitOps principles for managing cluster configurations
185185
and application delivery across hybrid multi-cluster Kubernetes environments.
186186
features.operators.openshift.io/disconnected: "true"

‎config/crd/bases/argoproj.io_argocds.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,6 @@ spec:
18941894
NetworkPolicy resources for this Argo CD instance.
18951895
properties:
18961896
enabled:
1897-
default: true
18981897
description: |-
18991898
Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance.
19001899
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
@@ -18020,7 +18019,6 @@ spec:
1802018019
NetworkPolicy resources for this Argo CD instance.
1802118020
properties:
1802218021
enabled:
18023-
default: true
1802418022
description: |-
1802518023
Enabled defines whether NetworkPolicy resources are created for this Argo CD instance.
1802618024
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
@@ -32359,4 +32357,4 @@ spec:
3235932357
served: true
3236032358
storage: true
3236132359
subresources:
32362-
status: {}
32360+
status: {}

‎go.mod‎

Lines changed: 7 additions & 7 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.25.5
3+
go 1.25.9
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67
7-
github.com/argoproj-labs/argocd-image-updater v1.1.1
8-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b
9-
github.com/argoproj/argo-cd/v3 v3.3.9
7+
github.com/argoproj-labs/argocd-image-updater v1.1.2
8+
github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530
9+
github.com/argoproj/argo-cd/v3 v3.3.10
1010
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d
1111
github.com/go-logr/logr v1.4.3
1212
github.com/google/go-cmp v0.7.0
@@ -153,9 +153,9 @@ require (
153153
github.com/xlab/treeprint v1.2.0 // indirect
154154
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
155155
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
156-
go.opentelemetry.io/otel v1.40.0 // indirect
157-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
158-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
156+
go.opentelemetry.io/otel v1.43.0 // indirect
157+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
158+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
159159
go.uber.org/multierr v1.11.0 // indirect
160160
go.yaml.in/yaml/v2 v2.4.2 // indirect
161161
go.yaml.in/yaml/v3 v3.0.4 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW
3737
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
3838
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67 h1:gFasfvlbOfrwzd7JaVTlnRgE7pDMFC+lQwt07gGGrbY=
3939
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
40-
github.com/argoproj-labs/argocd-image-updater v1.1.1 h1:7YDaR3WX2NMsDKp0wN7TRaRRHaVHQ94tSybi2P99MGk=
41-
github.com/argoproj-labs/argocd-image-updater v1.1.1/go.mod h1:gMHiNrGNwNSt4ljf0ykcnmNvXBk/NJ+Z17AnZVe7V7I=
42-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b h1:HxyuUUBlSPwKWSvLHnCibtR4Yz3Z6qpEm5wSi3a5oIw=
43-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b/go.mod h1:J1/kP2zzXbKU5Austr4Eg3qAilMtRyQX8yu0/ALUzD0=
44-
github.com/argoproj/argo-cd/v3 v3.3.9 h1:5etMk6bD18iIiSeRo/5zTsp6Bwn6heoVeHIeA3++SSI=
45-
github.com/argoproj/argo-cd/v3 v3.3.9/go.mod h1:Qh80AE4vFLe5jhdI7qYareRc7YOTLDQsDEq7ghvs0Qc=
40+
github.com/argoproj-labs/argocd-image-updater v1.1.2 h1:z7zXF30lGap5DqHdVRPWd6qtOKXh1czl5WL0iEXi3lE=
41+
github.com/argoproj-labs/argocd-image-updater v1.1.2/go.mod h1:EpwMlbWGInyqkRhCWAD18bvgNdk/s7SUSEXtM+K9ApE=
42+
github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530 h1:lRRwPjNFq4Ho52720p0Vn73RzJbIYMcre3nZ84uwcuU=
43+
github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530/go.mod h1:AlQPFgHsfi3ibtAuRvV2Gxn8rkFe9eunqzBb8AMS2nk=
44+
github.com/argoproj/argo-cd/v3 v3.3.10 h1:3QE36lhN/0ntjwl2TH13xL23w2J2AaXgC0Dxn0469h4=
45+
github.com/argoproj/argo-cd/v3 v3.3.10/go.mod h1:LdPjAnIFbx0khaB6vLsOKrGoSWeJ8kzOt//jF1ltCPg=
4646
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d h1:iUJYrbSvpV9n8vyl1sBt1GceM60HhHfnHxuzcm5apDg=
4747
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d/go.mod h1:PauXVUVcfiTgC+34lDdWzPS101g4NpsUtDAjFBnWf94=
4848
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=
@@ -453,16 +453,16 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
453453
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
454454
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
455455
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
456-
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
457-
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
458-
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
459-
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
460-
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
461-
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
456+
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
457+
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
458+
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
459+
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
460+
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
461+
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
462462
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
463463
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
464-
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
465-
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
464+
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
465+
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
466466
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
467467
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
468468
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=

‎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 quay.io/devtools_gitops/go-toolset:1.25.5
3+
FROM quay.io/devtools_gitops/go-toolset:1.25.9
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
9696
// when running against openshift-ci
9797
expected_dexVersion = "v2.43.0"
9898
expected_redisVersion = "8.2.3"
99-
expected_argocdVersion = "v3.3.2"
99+
expected_argocdVersion = "v3.3.10"
100100

101101
} else {
102102
// when running against RC/ released version of gitops
103103
expected_dexVersion = "v2.43.1"
104104
expected_redisVersion = "7.2.11"
105-
expected_argocdVersion = "v3.3.9"
105+
expected_argocdVersion = "v3.3.10"
106106
}
107107

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

0 commit comments

Comments
 (0)