Skip to content

Commit e61a4fc

Browse files
authored
Upgrade Kubernetes dependencies to v1.32 (#440)
Signed-off-by: utam0k <[email protected]>
1 parent 36e5cf3 commit e61a4fc

File tree

16 files changed

+333
-392
lines changed

16 files changed

+333
-392
lines changed

scenario/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 docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

scenario/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/kube-scheduler-simulator/scenario
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/onsi/ginkgo/v2 v2.21.0

simulator/.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ linters:
6767
- gocritic
6868
- gocyclo
6969
- godot
70-
- err113
70+
- goerr113
7171
- gofmt
7272
- gofumpt
7373
- gosec

simulator/cmd/scheduler/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22 AS build-env
1+
FROM golang:1.24 AS build-env
22
ARG TARGETOS
33
ARG TARGETARCH
44

simulator/cmd/simulator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22 AS build-env
1+
FROM golang:1.24 AS build-env
22

33
ARG TARGETOS
44
ARG TARGETARCH

simulator/go.mod

Lines changed: 96 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,176 +1,175 @@
11
module sigs.k8s.io/kube-scheduler-simulator/simulator
22

3-
go 1.22.1
3+
go 1.24.0
44

55
replace (
6-
google.golang.org/grpc => google.golang.org/grpc v1.38.0
7-
k8s.io/api => k8s.io/api v0.30.4
8-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
9-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
10-
k8s.io/apiserver => k8s.io/apiserver v0.30.4
11-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
12-
k8s.io/client-go => k8s.io/client-go v0.30.4
13-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
14-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
15-
k8s.io/code-generator => k8s.io/code-generator v0.30.4
16-
k8s.io/component-base => k8s.io/component-base v0.30.4
17-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
18-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
19-
k8s.io/cri-api => k8s.io/cri-api v0.30.4
20-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
21-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.4
22-
k8s.io/endpointslice => k8s.io/endpointslice v0.30.4
23-
k8s.io/kms => k8s.io/kms v0.30.4
24-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
25-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
26-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
27-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
28-
k8s.io/kubectl => k8s.io/kubectl v0.30.4
29-
k8s.io/kubelet => k8s.io/kubelet v0.30.4
30-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
31-
k8s.io/metrics => k8s.io/metrics v0.30.4
32-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
33-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
34-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
6+
google.golang.org/grpc => google.golang.org/grpc v1.65.0
7+
k8s.io/api => k8s.io/api v0.32.0
8+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0
9+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.0
10+
k8s.io/apiserver => k8s.io/apiserver v0.32.0
11+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0
12+
k8s.io/client-go => k8s.io/client-go v0.32.0
13+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0
14+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0
15+
k8s.io/code-generator => k8s.io/code-generator v0.32.0
16+
k8s.io/component-base => k8s.io/component-base v0.32.0
17+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.0
18+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.0
19+
k8s.io/cri-api => k8s.io/cri-api v0.32.0
20+
k8s.io/cri-client => k8s.io/cri-client v0.32.0
21+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0
22+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.0
23+
k8s.io/endpointslice => k8s.io/endpointslice v0.32.0
24+
k8s.io/externaljwt => k8s.io/externaljwt v0.32.0
25+
k8s.io/kms => k8s.io/kms v0.32.0
26+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0
27+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0
28+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0
29+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0
30+
k8s.io/kubectl => k8s.io/kubectl v0.32.0
31+
k8s.io/kubelet => k8s.io/kubelet v0.32.0
32+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.0
33+
k8s.io/metrics => k8s.io/metrics v0.32.0
34+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.0
35+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.0
36+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
3537
)
3638

3739
require (
3840
github.com/docker/docker v27.2.0+incompatible
3941
github.com/google/go-cmp v0.6.0
4042
github.com/labstack/echo/v4 v4.5.0
4143
github.com/labstack/gommon v0.3.0
42-
github.com/spf13/cobra v1.7.0
44+
github.com/spf13/cobra v1.8.1
4345
github.com/stretchr/testify v1.9.0
44-
go.etcd.io/etcd/client/v3 v3.5.10
46+
go.etcd.io/etcd/client/v3 v3.5.16
4547
go.uber.org/mock v0.5.0
4648
golang.org/x/sync v0.8.0
4749
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
4850
gopkg.in/yaml.v2 v2.4.0
49-
k8s.io/api v0.30.4
50-
k8s.io/apimachinery v0.30.4
51-
k8s.io/client-go v0.30.4
52-
k8s.io/code-generator v0.30.4
53-
k8s.io/component-base v0.30.4
51+
k8s.io/api v0.32.5
52+
k8s.io/apimachinery v0.32.5
53+
k8s.io/client-go v0.32.5
54+
k8s.io/code-generator v0.32.0
55+
k8s.io/component-base v0.32.5
5456
k8s.io/klog v1.0.0
55-
k8s.io/klog/v2 v2.120.1
56-
k8s.io/kube-scheduler v0.30.4
57-
k8s.io/kubernetes v1.30.4
58-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
59-
sigs.k8s.io/kube-scheduler-wasm-extension/scheduler v0.0.0-20241111155045-2ce7072312c8
57+
k8s.io/klog/v2 v2.130.1
58+
k8s.io/kube-scheduler v0.32.0
59+
k8s.io/kubernetes v1.32.5
60+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
61+
sigs.k8s.io/kube-scheduler-wasm-extension/scheduler v0.0.0-20250615114056-9b9e18b9d66a
6062
)
6163

6264
require (
63-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
64-
github.com/Microsoft/go-winio v0.6.0 // indirect
65+
cel.dev/expr v0.18.0 // indirect
66+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
67+
github.com/Microsoft/go-winio v0.6.2 // indirect
6568
github.com/NYTimes/gziphandler v1.1.1 // indirect
66-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
69+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6770
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
6871
github.com/beorn7/perks v1.0.1 // indirect
6972
github.com/blang/semver/v4 v4.0.0 // indirect
7073
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
71-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
72-
github.com/containerd/log v0.1.0 // indirect
74+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7375
github.com/coreos/go-semver v0.3.1 // indirect
7476
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
75-
github.com/davecgh/go-spew v1.1.1 // indirect
76-
github.com/distribution/reference v0.5.0 // indirect
77+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
78+
github.com/distribution/reference v0.6.0 // indirect
7779
github.com/docker/go-connections v0.5.0 // indirect
7880
github.com/docker/go-units v0.5.0 // indirect
7981
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
80-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
81-
github.com/felixge/httpsnoop v1.0.3 // indirect
82+
github.com/felixge/httpsnoop v1.0.4 // indirect
8283
github.com/fsnotify/fsnotify v1.7.0 // indirect
84+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8385
github.com/go-logr/logr v1.4.2 // indirect
8486
github.com/go-logr/stdr v1.2.2 // indirect
8587
github.com/go-logr/zapr v1.3.0 // indirect
86-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
88+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8789
github.com/go-openapi/jsonreference v0.20.2 // indirect
88-
github.com/go-openapi/swag v0.22.3 // indirect
90+
github.com/go-openapi/swag v0.23.0 // indirect
8991
github.com/gogo/protobuf v1.3.2 // indirect
9092
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
91-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9293
github.com/golang/protobuf v1.5.4 // indirect
93-
github.com/google/cel-go v0.17.8 // indirect
94+
github.com/google/btree v1.0.1 // indirect
95+
github.com/google/cel-go v0.22.0 // indirect
9496
github.com/google/gnostic-models v0.6.8 // indirect
9597
github.com/google/gofuzz v1.2.0 // indirect
9698
github.com/google/uuid v1.6.0 // indirect
9799
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
98100
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
99-
github.com/imdario/mergo v0.3.15 // indirect
100101
github.com/inconshreveable/mousetrap v1.1.0 // indirect
101102
github.com/josharian/intern v1.0.0 // indirect
102103
github.com/json-iterator/go v1.1.12 // indirect
103104
github.com/mailru/easyjson v0.7.7 // indirect
104105
github.com/mattn/go-colorable v0.1.8 // indirect
105106
github.com/mattn/go-isatty v0.0.12 // indirect
106-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
107107
github.com/moby/docker-image-spec v1.3.1 // indirect
108-
github.com/moby/sys/mountinfo v0.6.2 // indirect
109-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
108+
github.com/moby/term v0.5.0 // indirect
110109
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
111110
github.com/modern-go/reflect2 v1.0.2 // indirect
112111
github.com/morikuni/aec v1.0.0 // indirect
113112
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
114113
github.com/opencontainers/go-digest v1.0.0 // indirect
115114
github.com/opencontainers/image-spec v1.1.0 // indirect
116-
github.com/opencontainers/selinux v1.11.0 // indirect
117115
github.com/pkg/errors v0.9.1 // indirect
118-
github.com/pmezard/go-difflib v1.0.0 // indirect
119-
github.com/prometheus/client_golang v1.16.0 // indirect
120-
github.com/prometheus/client_model v0.4.0 // indirect
121-
github.com/prometheus/common v0.44.0 // indirect
122-
github.com/prometheus/procfs v0.10.1 // indirect
116+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
117+
github.com/prometheus/client_golang v1.19.1 // indirect
118+
github.com/prometheus/client_model v0.6.1 // indirect
119+
github.com/prometheus/common v0.55.0 // indirect
120+
github.com/prometheus/procfs v0.15.1 // indirect
123121
github.com/spf13/pflag v1.0.5 // indirect
124-
github.com/stoewer/go-strcase v1.2.0 // indirect
122+
github.com/stoewer/go-strcase v1.3.0 // indirect
125123
github.com/tetratelabs/wazero v1.7.2 // indirect
126124
github.com/valyala/bytebufferpool v1.0.0 // indirect
127125
github.com/valyala/fasttemplate v1.2.1 // indirect
128-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
129-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
130-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
131-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
126+
github.com/x448/float16 v0.8.4 // indirect
127+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
128+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
129+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
132131
go.opentelemetry.io/otel v1.29.0 // indirect
133132
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
134-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
135134
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 // indirect
136135
go.opentelemetry.io/otel/metric v1.29.0 // indirect
137136
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
138137
go.opentelemetry.io/otel/trace v1.29.0 // indirect
139138
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
140139
go.uber.org/multierr v1.11.0 // indirect
141-
go.uber.org/zap v1.26.0 // indirect
142-
golang.org/x/crypto v0.26.0 // indirect
143-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
144-
golang.org/x/mod v0.18.0 // indirect
145-
golang.org/x/net v0.28.0 // indirect
146-
golang.org/x/oauth2 v0.22.0 // indirect
147-
golang.org/x/sys v0.24.0 // indirect
148-
golang.org/x/term v0.23.0 // indirect
149-
golang.org/x/text v0.17.0 // indirect
150-
golang.org/x/time v0.3.0 // indirect
151-
golang.org/x/tools v0.22.0 // indirect
152-
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
153-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
140+
go.uber.org/zap v1.27.0 // indirect
141+
golang.org/x/crypto v0.28.0 // indirect
142+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
143+
golang.org/x/mod v0.21.0 // indirect
144+
golang.org/x/net v0.30.0 // indirect
145+
golang.org/x/oauth2 v0.23.0 // indirect
146+
golang.org/x/sys v0.26.0 // indirect
147+
golang.org/x/term v0.25.0 // indirect
148+
golang.org/x/text v0.19.0 // indirect
149+
golang.org/x/time v0.7.0 // indirect
150+
golang.org/x/tools v0.26.0 // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
154153
google.golang.org/grpc v1.65.0 // indirect
155-
google.golang.org/protobuf v1.34.2 // indirect
154+
google.golang.org/protobuf v1.35.1 // indirect
155+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
156156
gopkg.in/inf.v0 v0.9.1 // indirect
157157
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
158158
gopkg.in/yaml.v3 v3.0.1 // indirect
159159
gotest.tools/v3 v3.5.1 // indirect
160160
k8s.io/apiextensions-apiserver v0.27.2 // indirect
161-
k8s.io/apiserver v0.30.4 // indirect
161+
k8s.io/apiserver v0.32.5 // indirect
162162
k8s.io/cloud-provider v0.30.4 // indirect
163-
k8s.io/component-helpers v0.30.4 // indirect
164-
k8s.io/controller-manager v0.30.4 // indirect
163+
k8s.io/component-helpers v0.32.5 // indirect
164+
k8s.io/controller-manager v0.32.5 // indirect
165165
k8s.io/csi-translation-lib v0.0.0 // indirect
166166
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
167-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
168-
k8s.io/kms v0.30.4 // indirect
169-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
170-
k8s.io/kubelet v0.30.4 // indirect
171-
k8s.io/mount-utils v0.0.0 // indirect
172-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
173-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
174-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
175-
sigs.k8s.io/yaml v1.3.0 // indirect
167+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
168+
k8s.io/kms v0.32.5 // indirect
169+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
170+
k8s.io/kubelet v0.32.5 // indirect
171+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
172+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
173+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
174+
sigs.k8s.io/yaml v1.4.0 // indirect
176175
)

0 commit comments

Comments
 (0)