Skip to content

Commit 3cbb76e

Browse files
authored
Merge pull request #1318 from sbueringer/pr-bump-1.35
⚠️ Bump to k8s.io/* v0.35.0
2 parents ed0bc4f + 10c819c commit 3cbb76e

File tree

13 files changed

+367
-294
lines changed

13 files changed

+367
-294
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.24"
3+
go: "1.25"
44
timeout: 10m
55
modules-download-mode: readonly
66
allow-parallel-runners: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SHELL:=/usr/bin/env bash
2727
#
2828
# Go.
2929
#
30-
GO_VERSION ?= 1.24.0
30+
GO_VERSION ?= 1.25.0
3131
GOTOOLCHAIN = go$(GO_VERSION)
3232
export GOTOOLCHAIN
3333

go.mod

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/controller-tools
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/fatih/color v1.18.0
@@ -14,13 +14,13 @@ require (
1414
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated
1515
gopkg.in/yaml.v2 v2.4.0
1616
gopkg.in/yaml.v3 v3.0.1
17-
k8s.io/api v0.34.1
18-
k8s.io/apiextensions-apiserver v0.34.1
19-
k8s.io/apimachinery v0.34.1
20-
k8s.io/apiserver v0.34.1
21-
k8s.io/code-generator v0.34.1
22-
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f
23-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
17+
k8s.io/api v0.35.0
18+
k8s.io/apiextensions-apiserver v0.35.0
19+
k8s.io/apimachinery v0.35.0
20+
k8s.io/apiserver v0.35.0
21+
k8s.io/code-generator v0.35.0
22+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b
23+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
2424
sigs.k8s.io/yaml v1.6.0
2525
)
2626

@@ -40,7 +40,6 @@ require (
4040
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4141
github.com/go-openapi/jsonreference v0.20.2 // indirect
4242
github.com/go-openapi/swag v0.23.0 // indirect
43-
github.com/gogo/protobuf v1.3.2 // indirect
4443
github.com/google/cel-go v0.26.0 // indirect
4544
github.com/google/gnostic-models v0.7.0 // indirect
4645
github.com/google/uuid v1.6.0 // indirect
@@ -55,45 +54,45 @@ require (
5554
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5655
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5756
github.com/nxadm/tail v1.4.8 // indirect
58-
github.com/prometheus/client_golang v1.22.0 // indirect
59-
github.com/prometheus/client_model v0.6.1 // indirect
60-
github.com/prometheus/common v0.62.0 // indirect
61-
github.com/prometheus/procfs v0.15.1 // indirect
57+
github.com/prometheus/client_golang v1.23.2 // indirect
58+
github.com/prometheus/client_model v0.6.2 // indirect
59+
github.com/prometheus/common v0.66.1 // indirect
60+
github.com/prometheus/procfs v0.16.1 // indirect
6261
github.com/stoewer/go-strcase v1.3.0 // indirect
6362
github.com/x448/float16 v0.8.4 // indirect
6463
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
65-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
66-
go.opentelemetry.io/otel v1.35.0 // indirect
64+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
65+
go.opentelemetry.io/otel v1.36.0 // indirect
6766
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
6867
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
69-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
70-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
71-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
68+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
69+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
70+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
7271
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
73-
go.yaml.in/yaml/v2 v2.4.2 // indirect
72+
go.yaml.in/yaml/v2 v2.4.3 // indirect
7473
go.yaml.in/yaml/v3 v3.0.4 // indirect
7574
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
7675
golang.org/x/mod v0.31.0 // indirect
7776
golang.org/x/net v0.48.0 // indirect
78-
golang.org/x/oauth2 v0.27.0 // indirect
77+
golang.org/x/oauth2 v0.30.0 // indirect
7978
golang.org/x/sync v0.19.0 // indirect
8079
golang.org/x/sys v0.39.0 // indirect
8180
golang.org/x/term v0.38.0 // indirect
8281
golang.org/x/text v0.32.0 // indirect
8382
golang.org/x/time v0.9.0 // indirect
84-
golang.org/x/tools/go/expect v0.1.0-deprecated // indirect
83+
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
8584
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
87-
google.golang.org/grpc v1.72.1 // indirect
88-
google.golang.org/protobuf v1.36.7 // indirect
85+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
86+
google.golang.org/grpc v1.72.2 // indirect
87+
google.golang.org/protobuf v1.36.8 // indirect
8988
gopkg.in/inf.v0 v0.9.1 // indirect
9089
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
91-
k8s.io/client-go v0.34.1 // indirect
92-
k8s.io/component-base v0.34.1 // indirect
90+
k8s.io/client-go v0.35.0 // indirect
91+
k8s.io/component-base v0.35.0 // indirect
9392
k8s.io/klog/v2 v2.130.1 // indirect
94-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
93+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
9594
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
96-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
95+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
9796
sigs.k8s.io/randfill v1.0.0 // indirect
9897
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
9998
)

0 commit comments

Comments
 (0)