Skip to content

Commit cbe5cdd

Browse files
marquizmarquiz
committed
go.mod: bump kubernetes to v1.32
Also bump to Kubernetes patch version in api/nfd to 1.30.8.
1 parent d109727 commit cbe5cdd

File tree

4 files changed

+199
-195
lines changed

4 files changed

+199
-195
lines changed

‎api/nfd/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.22.2
55
require (
66
github.com/gogo/protobuf v1.3.2
77
github.com/stretchr/testify v1.8.4
8-
k8s.io/api v0.30.7
9-
k8s.io/apimachinery v0.30.7
8+
k8s.io/api v0.30.8
9+
k8s.io/apimachinery v0.30.8
1010
)
1111

1212
require (

‎api/nfd/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
7575
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
7676
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
7777
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
78-
k8s.io/api v0.30.7 h1:wB2eHI+IptVYsz5WsAQpI6+Dqi3+11wEWBqIh4fh980=
79-
k8s.io/api v0.30.7/go.mod h1:bR0EwbmhYmJvUoeza7ZzBUmYCrVXccQ9JOdfv0BxhH0=
80-
k8s.io/apimachinery v0.30.7 h1:CoQFxvzPFKwU1eJGN/8LgM3ZJBC3hKgvwGqRrL43uIY=
81-
k8s.io/apimachinery v0.30.7/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
78+
k8s.io/api v0.30.8 h1:Y+yZRF3c1WC0MTkLe0qBkiLCquRNa4I21/iDioGMCbo=
79+
k8s.io/api v0.30.8/go.mod h1:89IE5MzirZ5HHxU/Hq1/KWGqXkhXClu/FHGesFhQ0A4=
80+
k8s.io/apimachinery v0.30.8 h1:9jyTItYzmJc00cBDxZC5ArFNxUeKCwbw0m760iFUMKY=
81+
k8s.io/apimachinery v0.30.8/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
8282
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
8383
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
8484
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=

‎go.mod‎

Lines changed: 77 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,26 @@ require (
2222
golang.org/x/net v0.32.0
2323
golang.org/x/time v0.8.0
2424
google.golang.org/grpc v1.69.0
25-
k8s.io/api v0.31.3
26-
k8s.io/apiextensions-apiserver v0.31.3
27-
k8s.io/apimachinery v0.31.3
28-
k8s.io/client-go v0.31.3
29-
k8s.io/code-generator v0.31.3
30-
k8s.io/component-base v0.31.3
25+
k8s.io/api v0.32.0
26+
k8s.io/apiextensions-apiserver v0.32.0
27+
k8s.io/apimachinery v0.32.0
28+
k8s.io/client-go v0.32.0
29+
k8s.io/code-generator v0.32.0
30+
k8s.io/component-base v0.32.0
3131
k8s.io/klog/v2 v2.130.1
32-
k8s.io/kubectl v0.31.3
33-
k8s.io/kubelet v0.31.3
34-
k8s.io/kubernetes v1.31.3
35-
k8s.io/pod-security-admission v0.31.3
36-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32+
k8s.io/kubectl v0.32.0
33+
k8s.io/kubelet v0.32.0
34+
k8s.io/kubernetes v1.32.0
35+
k8s.io/pod-security-admission v0.32.0
36+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3737
sigs.k8s.io/node-feature-discovery/api/nfd v0.0.0-00010101000000-000000000000
3838
sigs.k8s.io/yaml v1.4.0
3939
)
4040

4141
require (
42-
github.com/Microsoft/go-winio v0.6.0 // indirect
42+
cel.dev/expr v0.18.0 // indirect
43+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
44+
github.com/Microsoft/go-winio v0.6.2 // indirect
4345
github.com/NYTimes/gziphandler v1.1.1 // indirect
4446
github.com/OneOfOne/xxhash v1.2.8 // indirect
4547
github.com/StackExchange/wmi v1.2.1 // indirect
@@ -49,50 +51,59 @@ require (
4951
github.com/blang/semver/v4 v4.0.0 // indirect
5052
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5153
github.com/cespare/xxhash/v2 v2.3.0 // indirect
54+
github.com/containerd/containerd/api v1.7.19 // indirect
55+
github.com/containerd/errdefs v0.1.0 // indirect
56+
github.com/containerd/log v0.1.0 // indirect
57+
github.com/containerd/ttrpc v1.2.5 // indirect
5258
github.com/coreos/go-semver v0.3.1 // indirect
5359
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5460
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
5561
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
56-
github.com/distribution/reference v0.5.0 // indirect
62+
github.com/distribution/reference v0.6.0 // indirect
63+
github.com/docker/go-units v0.5.0 // indirect
5764
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
65+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
5866
github.com/felixge/httpsnoop v1.0.4 // indirect
5967
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6068
github.com/go-logr/logr v1.4.2 // indirect
6169
github.com/go-logr/stdr v1.2.2 // indirect
6270
github.com/go-ole/go-ole v1.2.6 // indirect
63-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
71+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6472
github.com/go-openapi/jsonreference v0.20.2 // indirect
65-
github.com/go-openapi/swag v0.22.4 // indirect
73+
github.com/go-openapi/swag v0.23.0 // indirect
6674
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6775
github.com/godbus/dbus/v5 v5.1.0 // indirect
6876
github.com/gogo/protobuf v1.3.2 // indirect
69-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7077
github.com/golang/protobuf v1.5.4 // indirect
71-
github.com/google/cel-go v0.20.1 // indirect
78+
github.com/google/btree v1.0.1 // indirect
79+
github.com/google/cadvisor v0.51.0 // indirect
80+
github.com/google/cel-go v0.22.0 // indirect
7281
github.com/google/gnostic-models v0.6.8 // indirect
7382
github.com/google/gofuzz v1.2.0 // indirect
7483
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
7584
github.com/gopherjs/gopherjs v1.17.2 // indirect
7685
github.com/gorilla/websocket v1.5.0 // indirect
7786
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7887
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
79-
github.com/imdario/mergo v0.3.6 // indirect
8088
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8189
github.com/jaypipes/pcidb v1.0.1 // indirect
8290
github.com/josharian/intern v1.0.0 // indirect
8391
github.com/json-iterator/go v1.1.12 // indirect
8492
github.com/jtolds/gls v4.20.0+incompatible // indirect
93+
github.com/karrick/godirwalk v1.17.0 // indirect
8594
github.com/mailru/easyjson v0.7.7 // indirect
95+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
8696
github.com/mitchellh/go-homedir v1.1.0 // indirect
87-
github.com/moby/spdystream v0.4.0 // indirect
88-
github.com/moby/sys/mountinfo v0.7.1 // indirect
97+
github.com/moby/spdystream v0.5.0 // indirect
98+
github.com/moby/sys/mountinfo v0.7.2 // indirect
8999
github.com/moby/sys/userns v0.1.0 // indirect
90100
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
91101
github.com/modern-go/reflect2 v1.0.2 // indirect
92102
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
93103
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
94104
github.com/opencontainers/go-digest v1.0.0 // indirect
95105
github.com/opencontainers/runtime-spec v1.2.0 // indirect
106+
github.com/opencontainers/selinux v1.11.1 // indirect
96107
github.com/pkg/errors v0.9.1 // indirect
97108
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
98109
github.com/prometheus/client_model v0.6.1 // indirect
@@ -101,12 +112,12 @@ require (
101112
github.com/sirupsen/logrus v1.9.3 // indirect
102113
github.com/smarty/assertions v1.15.1 // indirect
103114
github.com/spf13/pflag v1.0.5 // indirect
104-
github.com/stoewer/go-strcase v1.2.0 // indirect
115+
github.com/stoewer/go-strcase v1.3.0 // indirect
105116
github.com/stretchr/objx v0.5.2 // indirect
106117
github.com/x448/float16 v0.8.4 // indirect
107-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
108-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
109-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
118+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
119+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
120+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
110121
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
111122
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
112123
go.opentelemetry.io/otel v1.31.0 // indirect
@@ -117,7 +128,7 @@ require (
117128
go.opentelemetry.io/otel/trace v1.31.0 // indirect
118129
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
119130
go.uber.org/multierr v1.11.0 // indirect
120-
go.uber.org/zap v1.26.0 // indirect
131+
go.uber.org/zap v1.27.0 // indirect
121132
golang.org/x/crypto v0.31.0 // indirect
122133
golang.org/x/mod v0.21.0 // indirect
123134
golang.org/x/oauth2 v0.23.0 // indirect
@@ -133,55 +144,55 @@ require (
133144
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
134145
gopkg.in/inf.v0 v0.9.1 // indirect
135146
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
136-
gopkg.in/yaml.v2 v2.4.0 // indirect
137147
gopkg.in/yaml.v3 v3.0.1 // indirect
138148
howett.net/plist v1.0.0 // indirect
139-
k8s.io/apiserver v0.31.3 // indirect
140-
k8s.io/cloud-provider v0.31.3 // indirect
141-
k8s.io/component-helpers v0.31.3 // indirect
142-
k8s.io/controller-manager v0.31.3 // indirect
143-
k8s.io/cri-api v0.31.3 // indirect
149+
k8s.io/apiserver v0.32.0 // indirect
150+
k8s.io/cloud-provider v0.32.0 // indirect
151+
k8s.io/component-helpers v0.32.0 // indirect
152+
k8s.io/controller-manager v0.32.0 // indirect
153+
k8s.io/cri-api v0.32.0 // indirect
144154
k8s.io/cri-client v0.0.0 // indirect
145-
k8s.io/csi-translation-lib v0.31.3 // indirect
146-
k8s.io/dynamic-resource-allocation v0.31.3 // indirect
147-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
148-
k8s.io/kms v0.31.3 // indirect
149-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
150-
k8s.io/mount-utils v0.31.3 // indirect
151-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
152-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
153-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
155+
k8s.io/csi-translation-lib v0.32.0 // indirect
156+
k8s.io/dynamic-resource-allocation v0.32.0 // indirect
157+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
158+
k8s.io/kms v0.32.0 // indirect
159+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
160+
k8s.io/kube-scheduler v0.0.0 // indirect
161+
k8s.io/mount-utils v0.32.0 // indirect
162+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
163+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
164+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
154165
)
155166

156167
// The k8s "sub-"packages do not have 'semver' compatible versions. Thus, we
157168
// need to override with commits (corresponding their kubernetes-* tags)
158169
replace (
159170
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
160-
k8s.io/api => k8s.io/api v0.31.3
161-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
162-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
163-
k8s.io/apiserver => k8s.io/apiserver v0.31.3
164-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
165-
k8s.io/client-go => k8s.io/client-go v0.31.3
166-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
167-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
168-
k8s.io/code-generator => k8s.io/code-generator v0.31.3
169-
k8s.io/component-base => k8s.io/component-base v0.31.3
170-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
171-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
172-
k8s.io/cri-api => k8s.io/cri-api v0.31.3
173-
k8s.io/cri-client => k8s.io/cri-client v0.31.3
174-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
175-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
176-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
177-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
178-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
179-
k8s.io/kubectl => k8s.io/kubectl v0.31.3
180-
k8s.io/kubelet => k8s.io/kubelet v0.31.3
181-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
182-
k8s.io/metrics => k8s.io/metrics v0.31.3
183-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.3
184-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
185-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
171+
k8s.io/api => k8s.io/api v0.32.0
172+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0
173+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.0
174+
k8s.io/apiserver => k8s.io/apiserver v0.32.0
175+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0
176+
k8s.io/client-go => k8s.io/client-go v0.32.0
177+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0
178+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0
179+
k8s.io/code-generator => k8s.io/code-generator v0.32.0
180+
k8s.io/component-base => k8s.io/component-base v0.32.0
181+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.0
182+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.0
183+
k8s.io/cri-api => k8s.io/cri-api v0.32.0
184+
k8s.io/cri-client => k8s.io/cri-client v0.32.0
185+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0
186+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0
187+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0
188+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0
189+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0
190+
k8s.io/kubectl => k8s.io/kubectl v0.32.0
191+
k8s.io/kubelet => k8s.io/kubelet v0.32.0
192+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.0
193+
k8s.io/metrics => k8s.io/metrics v0.32.0
194+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.0
195+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.0
196+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
186197
sigs.k8s.io/node-feature-discovery/api/nfd => ./api/nfd
187198
)

0 commit comments

Comments
 (0)