Skip to content

Commit 4bf067b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1758 from dgrisonnet/update-golang
Update to go 1.25 and Kubernetes 1.35
2 parents 415f828 + b5367c0 commit 4bf067b

File tree

9 files changed

+481
-430
lines changed

9 files changed

+481
-430
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Update the base image in Makefile when updating golang version. This has to
22
# be pre-pulled in order to work on GCB.
33
ARG ARCH
4-
FROM golang:1.24.10 as build
4+
FROM golang:1.25.6 as build
55

66
WORKDIR /go/src/sigs.k8s.io/metrics-server
77
COPY go.mod .

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ CONTAINER_ARCH_TARGETS=$(addprefix container-,$(ALL_ARCHITECTURES))
8181
container:
8282
# Pull base image explicitly. Keep in sync with Dockerfile, otherwise
8383
# GCB builds will start failing.
84-
${CONTAINER_CLI} pull golang:1.24.10
84+
${CONTAINER_CLI} pull golang:1.25.6
8585
${CONTAINER_CLI} build -t $(REGISTRY)/metrics-server-$(ARCH):$(CHECKSUM) --build-arg ARCH=$(ARCH) --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT) .
8686

8787
.PHONY: container-all
@@ -179,10 +179,14 @@ test-image-all:
179179
# -----------
180180

181181
.PHONY: test-e2e
182-
test-e2e: test-e2e-1.33
182+
test-e2e: test-e2e-1.35
183183

184184
.PHONY: test-e2e-all
185-
test-e2e-all: test-e2e-1.34 test-e2e-1.33 test-e2e-1.32
185+
test-e2e-all: test-e2e-1.35 test-e2e-1.34 test-e2e-1.33
186+
187+
.PHONY: test-e2e-1.35
188+
test-e2e-1.35:
189+
NODE_IMAGE=kindest/node:v1.35.0@sha256:4613778f3cfcd10e615029370f5786704559103cf27bef934597ba562b269661 KIND_CONFIG="${PWD}/test/kind-config-with-sidecar-containers.yaml" ./test/test-e2e.sh
186190

187191
.PHONY: test-e2e-1.34
188192
test-e2e-1.34:
@@ -192,10 +196,6 @@ test-e2e-1.34:
192196
test-e2e-1.33:
193197
NODE_IMAGE=kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2 KIND_CONFIG="${PWD}/test/kind-config-with-sidecar-containers.yaml" ./test/test-e2e.sh
194198

195-
.PHONY: test-e2e-1.32
196-
test-e2e-1.32:
197-
NODE_IMAGE=kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1 KIND_CONFIG="${PWD}/test/kind-config-with-sidecar-containers.yaml" ./test/test-e2e.sh
198-
199199
.PHONY: test-e2e-ha
200200
test-e2e-ha:
201201
SKAFFOLD_PROFILE="test-ha" $(MAKE) test-e2e

‎docs/command-line-flags.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ Generic flags:
2727
--livez-grace-period duration This option represents the maximum amount of time it should take for apiserver to complete its startup sequence and become live. From apiserver's start time to when this amount of time has elapsed, /livez will assume that unfinished post-start hooks will complete successfully and therefore return true.
2828
--max-mutating-requests-inflight int This and --max-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of mutating requests in flight, or a zero value disables the limit completely. (default 200)
2929
--max-requests-inflight int This and --max-mutating-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of non-mutating requests in flight, or a zero value disables the limit completely. (default 400)
30+
--min-compatibility-version strings The min version of control plane components the server should be compatible with.
31+
Must be less or equal to the emulated-version. Version format could only be major.minor, for example: '--min-compatibility-version=wardle=1.2,kube=1.31'.
32+
Options are:
33+
If the component is not specified, defaults to "kube"
3034
--min-request-timeout int An optional field indicating the minimum number of seconds a handler must keep a request open before timing it out. Currently only honored by the watch request handler, which picks a randomized value above this number as the connection timeout, to spread out load. (default 1800)
3135
--request-timeout duration An optional field indicating the duration a handler must keep a request open before timing it out. This is the default request timeout for requests but may be overridden by flags such as --min-request-timeout for specific types of requests. (default 1m0s)
3236
--runtime-config-emulation-forward-compatible If true, APIs identified by group/version that are enabled in the --runtime-config flag will be installed even if it is introduced after the emulation version. If false, server would fail to start if any APIs identified by group/version that are enabled in the --runtime-config flag are introduced after the emulation version. Can only be set to true if the emulation version is lower than the binary version.

‎go.mod‎

Lines changed: 82 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,139 @@
11
module sigs.k8s.io/metrics-server
22

3-
go 1.24.10
3+
go 1.25.6
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/onsi/ginkgo/v2 v2.23.4
8-
github.com/onsi/gomega v1.38.0
9-
github.com/prometheus/common v0.65.0
10-
github.com/prometheus/prometheus v0.305.0
11-
github.com/spf13/cobra v1.9.1
12-
github.com/spf13/pflag v1.0.7
13-
k8s.io/api v0.34.0
14-
k8s.io/apimachinery v0.34.0
15-
k8s.io/apiserver v0.34.0
16-
k8s.io/client-go v0.34.0
17-
k8s.io/component-base v0.34.0
7+
github.com/onsi/ginkgo/v2 v2.27.2
8+
github.com/onsi/gomega v1.38.2
9+
github.com/prometheus/common v0.67.5
10+
github.com/prometheus/prometheus v0.309.1
11+
github.com/spf13/cobra v1.10.2
12+
github.com/spf13/pflag v1.0.10
13+
k8s.io/api v0.35.0
14+
k8s.io/apimachinery v0.35.0
15+
k8s.io/apiserver v0.35.0
16+
k8s.io/client-go v0.35.0
17+
k8s.io/component-base v0.35.0
1818
k8s.io/klog/v2 v2.130.1
19-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
20-
k8s.io/metrics v0.34.0
19+
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4
20+
k8s.io/metrics v0.35.0
2121
)
2222

2323
require (
24-
cel.dev/expr v0.24.0 // indirect
25-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
24+
cel.dev/expr v0.25.1 // indirect
25+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2626
github.com/BurntSushi/toml v0.3.1 // indirect
27+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2728
github.com/NYTimes/gziphandler v1.1.1 // indirect
2829
github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect
29-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
30+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/blang/semver/v4 v4.0.0 // indirect
3233
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
33-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
34+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3435
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3536
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
3637
github.com/coreos/go-semver v0.3.1 // indirect
37-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
38+
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
3839
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
39-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
40+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4041
github.com/felixge/httpsnoop v1.0.4 // indirect
4142
github.com/fsnotify/fsnotify v1.9.0 // indirect
4243
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
43-
github.com/go-logr/logr v1.4.2 // indirect
44+
github.com/go-logr/logr v1.4.3 // indirect
4445
github.com/go-logr/stdr v1.2.2 // indirect
4546
github.com/go-logr/zapr v1.3.0 // indirect
46-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
47-
github.com/go-openapi/jsonreference v0.21.0 // indirect
48-
github.com/go-openapi/swag v0.23.0 // indirect
47+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
48+
github.com/go-openapi/jsonreference v0.21.4 // indirect
49+
github.com/go-openapi/swag v0.25.4 // indirect
50+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
51+
github.com/go-openapi/swag/conv v0.25.4 // indirect
52+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
53+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
54+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
55+
github.com/go-openapi/swag/loading v0.25.4 // indirect
56+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
57+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
58+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
59+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
60+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
4961
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5062
github.com/gogo/protobuf v1.3.2 // indirect
5163
github.com/golang/protobuf v1.5.4 // indirect
5264
github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 // indirect
5365
github.com/google/addlicense v1.1.1 // indirect
5466
github.com/google/btree v1.1.3 // indirect
55-
github.com/google/cel-go v0.26.0 // indirect
56-
github.com/google/gnostic-models v0.7.0 // indirect
57-
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
67+
github.com/google/cel-go v0.26.1 // indirect
68+
github.com/google/gnostic-models v0.7.1 // indirect
69+
github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f // indirect
5870
github.com/google/uuid v1.6.0 // indirect
5971
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
60-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
72+
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
6173
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
62-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
74+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.5 // indirect
6375
github.com/inconshreveable/mousetrap v1.1.0 // indirect
64-
github.com/josharian/intern v1.0.0 // indirect
6576
github.com/json-iterator/go v1.1.12 // indirect
6677
github.com/kylelemons/godebug v1.1.0 // indirect
67-
github.com/mailru/easyjson v0.7.7 // indirect
6878
github.com/mmarkdown/mmark v2.0.40+incompatible // indirect
6979
github.com/moby/spdystream v0.5.0 // indirect
70-
github.com/moby/term v0.5.0 // indirect
80+
github.com/moby/term v0.5.2 // indirect
7181
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7282
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7383
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7484
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
75-
github.com/pkg/errors v0.9.1 // indirect
7685
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
77-
github.com/prometheus/client_golang v1.22.0 // indirect
86+
github.com/prometheus/client_golang v1.23.2 // indirect
7887
github.com/prometheus/client_model v0.6.2 // indirect
79-
github.com/prometheus/procfs v0.15.1 // indirect
80-
github.com/stoewer/go-strcase v1.3.0 // indirect
88+
github.com/prometheus/procfs v0.19.2 // indirect
89+
github.com/stoewer/go-strcase v1.3.1 // indirect
8190
github.com/x448/float16 v0.8.4 // indirect
82-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
83-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
84-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
85-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
86-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
87-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
88-
go.opentelemetry.io/otel v1.36.0 // indirect
89-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
90-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
91-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
92-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
93-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
94-
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
95-
go.uber.org/automaxprocs v1.6.0 // indirect
91+
go.etcd.io/etcd/api/v3 v3.6.7 // indirect
92+
go.etcd.io/etcd/client/pkg/v3 v3.6.7 // indirect
93+
go.etcd.io/etcd/client/v3 v3.6.7 // indirect
94+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // indirect
96+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
97+
go.opentelemetry.io/otel v1.39.0 // indirect
98+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
99+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
100+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
101+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
102+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
103+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
96104
go.uber.org/multierr v1.11.0 // indirect
97-
go.uber.org/zap v1.27.0 // indirect
98-
go.yaml.in/yaml/v2 v2.4.2 // indirect
105+
go.uber.org/zap v1.27.1 // indirect
106+
go.yaml.in/yaml/v2 v2.4.3 // indirect
99107
go.yaml.in/yaml/v3 v3.0.4 // indirect
100-
golang.org/x/crypto v0.45.0 // indirect
101-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
102-
golang.org/x/mod v0.29.0 // indirect
103-
golang.org/x/net v0.47.0 // indirect
104-
golang.org/x/oauth2 v0.30.0 // indirect
108+
golang.org/x/crypto v0.47.0 // indirect
109+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
110+
golang.org/x/mod v0.32.0 // indirect
111+
golang.org/x/net v0.49.0 // indirect
112+
golang.org/x/oauth2 v0.34.0 // indirect
105113
golang.org/x/perf v0.0.0-20250605212013-b481878a17be // indirect
106-
golang.org/x/sync v0.18.0 // indirect
107-
golang.org/x/sys v0.38.0 // indirect
108-
golang.org/x/term v0.37.0 // indirect
109-
golang.org/x/text v0.31.0 // indirect
110-
golang.org/x/time v0.12.0 // indirect
111-
golang.org/x/tools v0.38.0 // indirect
112-
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
113-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
114-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
115-
google.golang.org/grpc v1.73.0 // indirect
116-
google.golang.org/protobuf v1.36.6 // indirect
117-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
114+
golang.org/x/sync v0.19.0 // indirect
115+
golang.org/x/sys v0.40.0 // indirect
116+
golang.org/x/term v0.39.0 // indirect
117+
golang.org/x/text v0.33.0 // indirect
118+
golang.org/x/time v0.14.0 // indirect
119+
golang.org/x/tools v0.41.0 // indirect
120+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
121+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
122+
google.golang.org/grpc v1.78.0 // indirect
123+
google.golang.org/protobuf v1.36.11 // indirect
124+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
118125
gopkg.in/inf.v0 v0.9.1 // indirect
119126
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
120-
gopkg.in/yaml.v3 v3.0.1 // indirect
121-
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
122-
k8s.io/kms v0.34.0 // indirect
123-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
124-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
125-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
127+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
128+
k8s.io/kms v0.35.0 // indirect
129+
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
130+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
131+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
126132
sigs.k8s.io/logtools v0.9.0 // indirect
127133
sigs.k8s.io/mdtoc v1.4.0 // indirect
128134
sigs.k8s.io/randfill v1.0.0 // indirect
129135
sigs.k8s.io/release-utils v0.8.3 // indirect
130-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
136+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
131137
sigs.k8s.io/yaml v1.6.0 // indirect
132138
)
133139

0 commit comments

Comments
 (0)