Skip to content

Commit 8e04fd3

Browse files
Merge pull request #415 from ricardomaraschini/CNTRLPLANE-2769
CNTRLPLANE-2769: bump kubernetes dependencies to v1.35
2 parents ec06b68 + f7f5ee1 commit 8e04fd3

2,466 files changed

Lines changed: 89535 additions & 70168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.24-openshift-4.22
4+
tag: rhel-9-release-golang-1.25-openshift-4.22

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-openshift-controller-manager-operator
33
COPY . .
44
RUN GO_COMPLIANCE_INFO=0 make build \

go.mod

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module github.com/openshift/cluster-openshift-controller-manager-operator
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/ghodss/yaml v1.0.0
77
github.com/google/go-cmp v0.7.0
8-
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251125140340-13f4631a80b0
9-
github.com/openshift/api v0.0.0-20260126183958-606bd613f9f7
8+
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
9+
github.com/openshift/api v0.0.0-20260306141135-f595753a3e66
1010
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af
11-
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13
12-
github.com/openshift/library-go v0.0.0-20260202103639-c3c3c4609280
11+
github.com/openshift/client-go v0.0.0-20260306160707-3935d929fc7d
12+
github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6
1313
github.com/prometheus/client_golang v1.23.2
1414
github.com/spf13/cobra v1.10.1
15-
k8s.io/api v0.34.2
16-
k8s.io/apimachinery v0.34.2
17-
k8s.io/client-go v0.34.2
18-
k8s.io/component-base v0.34.2
15+
k8s.io/api v0.35.2
16+
k8s.io/apimachinery v0.35.2
17+
k8s.io/client-go v0.35.2
18+
k8s.io/component-base v0.35.2
1919
k8s.io/klog/v2 v2.130.1
20-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
20+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
2121
)
2222

2323
require (
@@ -70,22 +70,22 @@ require (
7070
github.com/spf13/pflag v1.0.9 // indirect
7171
github.com/stoewer/go-strcase v1.3.0 // indirect
7272
github.com/x448/float16 v0.8.4 // indirect
73-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
74-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
75-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
73+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
74+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
75+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
7676
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7777
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
78-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
79-
go.opentelemetry.io/otel v1.35.0 // indirect
78+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
79+
go.opentelemetry.io/otel v1.36.0 // indirect
8080
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
8181
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
82-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
83-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
84-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
82+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
83+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
84+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
8585
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8686
go.uber.org/multierr v1.11.0 // indirect
8787
go.uber.org/zap v1.27.0 // indirect
88-
go.yaml.in/yaml/v2 v2.4.2 // indirect
88+
go.yaml.in/yaml/v2 v2.4.3 // indirect
8989
go.yaml.in/yaml/v3 v3.0.4 // indirect
9090
golang.org/x/crypto v0.45.0 // indirect
9191
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
@@ -97,21 +97,21 @@ require (
9797
golang.org/x/text v0.31.0 // indirect
9898
golang.org/x/time v0.9.0 // indirect
9999
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
101-
google.golang.org/grpc v1.72.1 // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
101+
google.golang.org/grpc v1.72.2 // indirect
102102
google.golang.org/protobuf v1.36.8 // indirect
103-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
103+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
104104
gopkg.in/inf.v0 v0.9.1 // indirect
105105
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
106106
gopkg.in/yaml.v2 v2.4.0 // indirect
107107
gopkg.in/yaml.v3 v3.0.1 // indirect
108-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
109-
k8s.io/apiserver v0.34.1 // indirect
110-
k8s.io/kms v0.34.1 // indirect
111-
k8s.io/kube-aggregator v0.34.1 // indirect
112-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
108+
k8s.io/apiextensions-apiserver v0.35.1 // indirect
109+
k8s.io/apiserver v0.35.1 // indirect
110+
k8s.io/kms v0.35.1 // indirect
111+
k8s.io/kube-aggregator v0.35.1 // indirect
112+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
113113
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
114-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
114+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
115115
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
116116
sigs.k8s.io/randfill v1.0.0 // indirect
117117
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect

0 commit comments

Comments
 (0)