Skip to content

Commit 80dc7a8

Browse files
olivergondzasvghadi
olivergondza
and
svghadi
authored
Bump argo cd 3.4.2 (#1158)
* chore(deps): Bump to Argo CD 3.3.10 Signed-off-by: Oliver Gondža <ogondza@gmail.com> * chore: Update dependant modules + go version for build Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Adjust image-updater tests Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Update the build image FROM Signed-off-by: Oliver Gondža <ogondza@gmail.com> * chore(deps): Bump argocd to 3.4.2 Signed-off-by: Oliver Gondža <ogondza@gmail.com> * USe go 1.26.2 Signed-off-by: Oliver Gondža <ogondza@gmail.com> * fix: Bump main Dockerfile as well Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Report actual Argo CD status while waiting for it to be Available Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Diagnose failing ArgoCD Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Diagnose the failures some more Signed-off-by: Oliver Gondža <ogondza@gmail.com> * go fmt Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Some more debug Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Add missing create sa token rbac for dex token Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Polish the debugging logic Signed-off-by: Oliver Gondža <ogondza@gmail.com> * OutputDebug in case starting the intrinsic instance fails Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Fix the DEX UID Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Pull argoproj-labs/argocd-operator#2216 Signed-off-by: Oliver Gondža <ogondza@gmail.com> * Fix 031_validate_toolchain test Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> --------- Signed-off-by: Oliver Gondža <ogondza@gmail.com> Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> Co-authored-by: Siddhesh Ghadi <61187612+svghadi@users.noreply.github.com> Co-authored-by: Siddhesh Ghadi <sghadi1203@gmail.com>
1 parent d4b8418 commit 80dc7a8

36 files changed

Lines changed: 207 additions & 188 deletions

‎.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.26.2

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.25 as builder
2+
FROM golang:1.26.2 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ metadata:
190190
capabilities: Deep Insights
191191
console.openshift.io/plugins: '["gitops-plugin"]'
192192
containerImage: quay.io/redhat-developer/gitops-operator
193-
createdAt: "2026-05-27T11:59:10Z"
193+
createdAt: "2026-06-03T18:12:37Z"
194194
description: Enables teams to adopt GitOps principles for managing cluster configurations
195195
and application delivery across hybrid multi-cluster Kubernetes environments.
196196
features.operators.openshift.io/disconnected: "true"
@@ -404,6 +404,7 @@ spec:
404404
- ""
405405
resources:
406406
- pods/eviction
407+
- serviceaccounts/token
407408
verbs:
408409
- create
409410
- apiGroups:

‎config/rbac/role.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ rules:
3838
- ""
3939
resources:
4040
- pods/eviction
41+
- serviceaccounts/token
4142
verbs:
4243
- create
4344
- apiGroups:

‎controllers/gitopsservice_controller.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ type ReconcileGitopsService struct {
215215
//+kubebuilder:rbac:groups="apiregistration.k8s.io",resources="apiservices",verbs=get;list
216216
//+kubebuilder:rbac:groups="argoproj.io",resources=namespacemanagements;namespacemanagements/status,verbs=create;get;list;watch;update;patch;delete;deletecollection
217217
//+kubebuilder:rbac:groups="config.openshift.io",resources=ingresses,verbs=get;list;watch
218+
//+kubebuilder:rbac:groups="",resources=serviceaccounts/token,verbs=create
218219

219220
// Reconcile reads that state of the cluster for a GitopsService object and makes changes based on the state read
220221
// and what is in the GitopsService.Spec

‎go.mod‎

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

3-
go 1.25.5
3+
go 1.26.2
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.9-0.20260505092152-3e07addcb2cb
7-
github.com/argoproj-labs/argocd-image-updater v1.1.1
8-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260410174833-e8a74112682f
9-
github.com/argoproj/argo-cd/v3 v3.3.6
10-
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d
7+
github.com/argoproj-labs/argocd-image-updater v1.2.1
8+
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260603181030-3beeabb300f9
9+
github.com/argoproj/argo-cd/gitops-engine v0.7.1-0.20250908182407-97ad5b59a627
10+
github.com/argoproj/argo-cd/v3 v3.4.2
1111
github.com/go-logr/logr v1.4.3
1212
github.com/google/go-cmp v0.7.0
1313
github.com/google/uuid v1.6.1-0.20241114170450-2d3c2a9cc518
1414
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
1515
github.com/hashicorp/go-version v1.7.0
16-
github.com/onsi/ginkgo/v2 v2.28.1
17-
github.com/onsi/gomega v1.39.1
16+
github.com/onsi/ginkgo/v2 v2.29.0
17+
github.com/onsi/gomega v1.41.0
1818
github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa
1919
github.com/operator-framework/api v0.17.5
2020
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
2121
github.com/stretchr/testify v1.11.1
22-
go.uber.org/zap v1.27.1
23-
golang.org/x/mod v0.35.0
22+
go.uber.org/zap v1.28.0
23+
golang.org/x/mod v0.36.0
2424
gopkg.in/yaml.v3 v3.0.1
2525
gotest.tools v2.2.0+incompatible
2626
k8s.io/api v0.35.2
@@ -53,16 +53,16 @@ require (
5353
github.com/blang/semver/v4 v4.0.0 // indirect
5454
github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
5555
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
56-
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 // indirect
56+
github.com/bradleyfalzon/ghinstallation/v2 v2.18.0 // indirect
5757
github.com/casbin/casbin/v2 v2.135.0 // indirect
5858
github.com/casbin/govaluate v1.10.0 // indirect
5959
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
60-
github.com/cert-manager/cert-manager v1.20.1 // indirect
60+
github.com/cert-manager/cert-manager v1.20.2 // indirect
6161
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6262
github.com/chai2010/gettext-go v1.0.3 // indirect
6363
github.com/chainguard-dev/git-urls v1.0.2 // indirect
6464
github.com/cloudflare/circl v1.6.3 // indirect
65-
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
65+
github.com/coreos/go-oidc/v3 v3.17.0 // indirect
6666
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
6767
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6868
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -83,10 +83,10 @@ require (
8383
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
8484
github.com/go-logr/stdr v1.2.2 // indirect
8585
github.com/go-logr/zapr v1.3.0 // indirect
86-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
87-
github.com/go-openapi/jsonreference v0.21.4 // indirect
86+
github.com/go-openapi/jsonpointer v0.22.5 // indirect
87+
github.com/go-openapi/jsonreference v0.21.5 // indirect
8888
github.com/go-openapi/swag v0.23.1 // indirect
89-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
89+
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
9090
github.com/go-redis/cache/v9 v9.0.0 // indirect
9191
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9292
github.com/gobwas/glob v0.2.3 // indirect
@@ -96,16 +96,16 @@ require (
9696
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
9797
github.com/golang/protobuf v1.5.4 // indirect
9898
github.com/google/btree v1.1.3 // indirect
99-
github.com/google/cel-go v0.26.0 // indirect
99+
github.com/google/cel-go v0.27.0 // indirect
100100
github.com/google/gnostic-models v0.7.1 // indirect
101101
github.com/google/go-github/v69 v69.2.0 // indirect
102-
github.com/google/go-github/v75 v75.0.0 // indirect
103-
github.com/google/go-querystring v1.1.0 // indirect
104-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
102+
github.com/google/go-github/v84 v84.0.0 // indirect
103+
github.com/google/go-querystring v1.2.0 // indirect
104+
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
105105
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
106106
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
107107
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
108-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
108+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
109109
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
110110
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
111111
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -121,7 +121,7 @@ require (
121121
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
122122
github.com/mailru/easyjson v0.9.1 // indirect
123123
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
124-
github.com/moby/spdystream v0.5.0 // indirect
124+
github.com/moby/spdystream v0.5.1 // indirect
125125
github.com/moby/term v0.5.2 // indirect
126126
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
127127
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
@@ -150,42 +150,41 @@ require (
150150
github.com/skeema/knownhosts v1.3.1 // indirect
151151
github.com/spf13/cobra v1.10.2 // indirect
152152
github.com/spf13/pflag v1.0.10 // indirect
153-
github.com/stoewer/go-strcase v1.3.1 // indirect
154153
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
155154
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
156155
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
157156
github.com/x448/float16 v0.8.4 // indirect
158157
github.com/xanzy/ssh-agent v0.3.3 // indirect
159158
github.com/xlab/treeprint v1.2.0 // indirect
160159
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
161-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
162-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
163-
go.opentelemetry.io/otel v1.40.0 // indirect
164-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
165-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
166-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
167-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
168-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
169-
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
160+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
161+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
162+
go.opentelemetry.io/otel v1.43.0 // indirect
163+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
164+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect
165+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
166+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
167+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
168+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
170169
go.uber.org/atomic v1.11.0 // indirect
171170
go.uber.org/multierr v1.11.0 // indirect
172171
go.yaml.in/yaml/v2 v2.4.3 // indirect
173172
go.yaml.in/yaml/v3 v3.0.4 // indirect
174173
golang.org/x/crypto v0.50.0 // indirect
175174
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
176175
golang.org/x/net v0.53.0 // indirect
177-
golang.org/x/oauth2 v0.35.0 // indirect
176+
golang.org/x/oauth2 v0.36.0 // indirect
178177
golang.org/x/sync v0.20.0 // indirect
179178
golang.org/x/sys v0.43.0 // indirect
180179
golang.org/x/term v0.42.0 // indirect
181180
golang.org/x/text v0.36.0 // indirect
182-
golang.org/x/time v0.14.0 // indirect
181+
golang.org/x/time v0.15.0 // indirect
183182
golang.org/x/tools v0.44.0 // indirect
184183
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
185184
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
186-
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
185+
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
187186
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
188-
google.golang.org/grpc v1.79.3 // indirect
187+
google.golang.org/grpc v1.80.0 // indirect
189188
google.golang.org/protobuf v1.36.11 // indirect
190189
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
191190
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -205,14 +204,18 @@ require (
205204
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
206205
sigs.k8s.io/gateway-api v1.5.0 // indirect
207206
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
208-
sigs.k8s.io/kustomize/api v0.21.0 // indirect
209-
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
207+
sigs.k8s.io/kustomize/api v0.21.1 // indirect
208+
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
210209
sigs.k8s.io/randfill v1.0.0 // indirect
211210
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
212211
)
213212

214213
replace (
215-
// This replace block is from Argo CD v3.3.6 go.mod
214+
// v3.4.2 declares gitops-engine at a pseudo-version where go.mod
215+
// didn't exist yet, then overrides with replace => ./gitops-engine locally.
216+
// Downstream consumers must resolve it themselves; pin to the v3.4.2 commit.
217+
github.com/argoproj/argo-cd/gitops-engine => github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260512203152-0dc6b1b57dd5
218+
// This replace block is from Argo CD v3.4.2 go.mod
216219
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
217220
github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0
218221
golang.org/x/tools => golang.org/x/tools v0.35.0

0 commit comments

Comments
 (0)