Skip to content

Commit 9e2cc20

Browse files
zhangzujianzhangzujian
authored
bump k8s to v1.31.0 (#4403)
* bump k8s to v1.31.0 * remove unused variables * workquque: use typed interface Signed-off-by: zhangzujian <[email protected]>
1 parent 1c1e1a5 commit 9e2cc20

File tree

98 files changed

+1340
-7860
lines changed

Some content is hidden

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

98 files changed

+1340
-7860
lines changed

‎dist/images/Dockerfile.base

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ARG ARCH
126126
ARG CNI_VERSION=v1.5.1
127127
RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan
128128

129-
ARG KUBE_VERSION="v1.30.3"
129+
ARG KUBE_VERSION="v1.31.0"
130130

131131
RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \
132132
&& chmod +x /usr/bin/kubectl && rm -rf ./kubernetes

‎go.mod

+73-78
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ require (
3030
github.com/ovn-org/libovsdb v0.7.0
3131
github.com/parnurzeal/gorequest v0.3.0
3232
github.com/prometheus-community/pro-bing v0.4.1
33-
github.com/prometheus/client_golang v1.18.0
33+
github.com/prometheus/client_golang v1.20.0
34+
github.com/puzpuzpuz/xsync/v3 v3.4.0
3435
github.com/scylladb/go-set v1.0.2
3536
github.com/sirupsen/logrus v1.9.3
3637
github.com/spf13/pflag v1.0.5
@@ -43,31 +44,27 @@ require (
4344
google.golang.org/grpc v1.65.0
4445
google.golang.org/protobuf v1.34.2
4546
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.1.0
46-
k8s.io/api v0.30.3
47-
k8s.io/apimachinery v0.30.3
47+
k8s.io/api v0.31.0
48+
k8s.io/apimachinery v0.31.0
4849
k8s.io/client-go v12.0.0+incompatible
4950
k8s.io/klog/v2 v2.130.1
50-
k8s.io/kubectl v0.30.3
51-
k8s.io/kubernetes v1.30.3
52-
k8s.io/pod-security-admission v0.30.3
51+
k8s.io/kubectl v0.31.0
52+
k8s.io/kubernetes v1.31.0
53+
k8s.io/pod-security-admission v0.31.0
5354
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
5455
kernel.org/pub/linux/libs/security/libcap/cap v1.2.70
5556
kubevirt.io/api v1.3.0
5657
kubevirt.io/client-go v1.3.0
57-
sigs.k8s.io/controller-runtime v0.18.5
58+
sigs.k8s.io/controller-runtime v0.19.0
5859
sigs.k8s.io/network-policy-api v0.1.5
5960
)
6061

6162
require (
62-
cloud.google.com/go/auth v0.7.3 // indirect
63-
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
64-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
6563
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
66-
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.20.0 // indirect
6764
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
6865
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6966
github.com/NYTimes/gziphandler v1.1.1 // indirect
70-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
67+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7168
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
7269
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
7370
github.com/beorn7/perks v1.0.1 // indirect
@@ -90,7 +87,7 @@ require (
9087
github.com/containerd/ttrpc v1.2.5 // indirect
9188
github.com/coreos/go-semver v0.3.1 // indirect
9289
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
93-
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
90+
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
9491
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9592
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
9693
github.com/distribution/reference v0.6.0 // indirect
@@ -105,6 +102,7 @@ require (
105102
github.com/fatih/camelcase v1.0.0 // indirect
106103
github.com/felixge/httpsnoop v1.0.4 // indirect
107104
github.com/fsnotify/fsnotify v1.7.0 // indirect
105+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
108106
github.com/go-errors/errors v1.5.1 // indirect
109107
github.com/go-ini/ini v1.67.0 // indirect
110108
github.com/go-kit/kit v0.13.0 // indirect
@@ -122,16 +120,12 @@ require (
122120
github.com/golang/protobuf v1.5.4 // indirect
123121
github.com/google/btree v1.1.2 // indirect
124122
github.com/google/cadvisor v0.50.0 // indirect
125-
github.com/google/cel-go v0.17.8 // indirect
123+
github.com/google/cel-go v0.21.0 // indirect
126124
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
127125
github.com/google/go-cmp v0.6.0 // indirect
128126
github.com/google/gofuzz v1.2.0 // indirect
129127
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
130-
github.com/google/s2a-go v0.1.8 // indirect
131128
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
132-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
133-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
134-
github.com/gopherjs/gopherjs v1.17.2 // indirect
135129
github.com/gorilla/websocket v1.5.3 // indirect
136130
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
137131
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -149,7 +143,9 @@ require (
149143
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
150144
github.com/karrick/godirwalk v1.17.0 // indirect
151145
github.com/kelseyhightower/envconfig v1.4.0 // indirect
146+
github.com/klauspost/compress v1.17.9 // indirect
152147
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
148+
github.com/kylelemons/godebug v1.1.0 // indirect
153149
github.com/libopenstorage/openstorage v1.0.0 // indirect
154150
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
155151
github.com/magiconair/properties v1.8.7 // indirect
@@ -187,25 +183,26 @@ require (
187183
github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba // indirect
188184
github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 // indirect
189185
github.com/projectcalico/libcalico-go v0.0.0-20190305235709-3d935c3b8b86 // indirect
190-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 // indirect
186+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.0 // indirect
191187
github.com/prometheus/client_model v0.6.1 // indirect
192-
github.com/prometheus/common v0.47.0 // indirect
193-
github.com/prometheus/procfs v0.12.0 // indirect
188+
github.com/prometheus/common v0.55.0 // indirect
189+
github.com/prometheus/procfs v0.15.1 // indirect
194190
github.com/russross/blackfriday/v2 v2.1.0 // indirect
195191
github.com/sagikazarmark/locafero v0.6.0 // indirect
196192
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
197193
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
198-
github.com/smartystreets/assertions v1.13.0 // indirect
199-
github.com/smartystreets/goconvey v1.6.4 // indirect
194+
github.com/smartystreets/goconvey v1.8.1 // indirect
200195
github.com/sourcegraph/conc v0.3.0 // indirect
201196
github.com/spf13/afero v1.11.0 // indirect
202197
github.com/spf13/cast v1.7.0 // indirect
203198
github.com/spf13/cobra v1.8.1 // indirect
204199
github.com/spf13/viper v1.19.0 // indirect
205200
github.com/stoewer/go-strcase v1.3.0 // indirect
201+
github.com/stretchr/objx v0.5.2 // indirect
206202
github.com/subosito/gotenv v1.6.0 // indirect
207203
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
208204
github.com/vishvananda/netns v0.0.4 // indirect
205+
github.com/x448/float16 v0.8.4 // indirect
209206
github.com/xlab/treeprint v1.2.0 // indirect
210207
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
211208
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
@@ -226,85 +223,83 @@ require (
226223
go.uber.org/multierr v1.11.0 // indirect
227224
go.uber.org/zap v1.27.0 // indirect
228225
golang.org/x/crypto v0.26.0 // indirect
229-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
226+
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
230227
golang.org/x/net v0.28.0 // indirect
231228
golang.org/x/oauth2 v0.22.0 // indirect
232229
golang.org/x/sync v0.8.0 // indirect
233230
golang.org/x/term v0.23.0 // indirect
234231
golang.org/x/text v0.17.0 // indirect
235232
golang.org/x/tools v0.24.0 // indirect
236233
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
237-
google.golang.org/api v0.190.0 // indirect
238-
google.golang.org/genproto v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
239-
google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
240-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 // indirect
241-
gopkg.in/evanphx/json-patch.v5 v5.9.0 // indirect
242-
gopkg.in/gcfg.v1 v1.2.3 // indirect
234+
google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect
235+
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect
236+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect
237+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
243238
gopkg.in/inf.v0 v0.9.1 // indirect
244239
gopkg.in/ini.v1 v1.67.0 // indirect
245240
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
246-
gopkg.in/warnings.v0 v0.1.2 // indirect
247241
gopkg.in/yaml.v2 v2.4.0 // indirect
248242
gopkg.in/yaml.v3 v3.0.1 // indirect
249-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
250-
k8s.io/apiserver v0.30.3 // indirect
251-
k8s.io/cli-runtime v0.30.3 // indirect
252-
k8s.io/cloud-provider v0.30.3 // indirect
253-
k8s.io/cluster-bootstrap v0.30.3 // indirect
254-
k8s.io/component-base v0.30.3 // indirect
255-
k8s.io/component-helpers v0.30.3 // indirect
256-
k8s.io/controller-manager v0.30.3 // indirect
257-
k8s.io/cri-api v0.30.3 // indirect
258-
k8s.io/csi-translation-lib v0.30.3 // indirect
243+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
244+
k8s.io/apiserver v0.31.0 // indirect
245+
k8s.io/cli-runtime v0.31.0 // indirect
246+
k8s.io/cloud-provider v0.31.0 // indirect
247+
k8s.io/cluster-bootstrap v0.31.0 // indirect
248+
k8s.io/component-base v0.31.0 // indirect
249+
k8s.io/component-helpers v0.31.0 // indirect
250+
k8s.io/controller-manager v0.31.0 // indirect
251+
k8s.io/cri-api v0.31.0 // indirect
252+
k8s.io/cri-client v0.0.0 // indirect
253+
k8s.io/csi-translation-lib v0.31.0 // indirect
259254
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
260-
k8s.io/kms v0.30.3 // indirect
261-
k8s.io/kube-openapi v0.30.0 // indirect
255+
k8s.io/kms v0.31.0 // indirect
256+
k8s.io/kube-openapi v0.31.0 // indirect
262257
k8s.io/kube-scheduler v0.0.0 // indirect
263-
k8s.io/kubelet v0.30.3 // indirect
264-
k8s.io/legacy-cloud-providers v0.0.0 // indirect
258+
k8s.io/kubelet v0.31.0 // indirect
265259
k8s.io/mount-utils v0.0.0 // indirect
266260
kernel.org/pub/linux/libs/security/libcap/psx v1.2.70 // indirect
267261
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
268262
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
269-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
263+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
270264
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
271-
sigs.k8s.io/kustomize/api v0.16.0 // indirect
272-
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
265+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
266+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
273267
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
274268
sigs.k8s.io/yaml v1.4.0 // indirect
275269
)
276270

277271
replace (
278272
github.com/mdlayher/arp => github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68
279273
github.com/openshift/client-go => github.com/openshift/client-go v0.0.1
280-
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240218023647-f0bc3ce57fcd
281-
k8s.io/api => k8s.io/api v0.30.3
282-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.3
283-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.3
284-
k8s.io/apiserver => k8s.io/apiserver v0.30.3
285-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.3
286-
k8s.io/client-go => k8s.io/client-go v0.30.3
287-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.3
288-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.3
289-
k8s.io/code-generator => k8s.io/code-generator v0.30.3
290-
k8s.io/component-base => k8s.io/component-base v0.30.3
291-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.3
292-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.3
293-
k8s.io/cri-api => k8s.io/cri-api v0.30.3
294-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.3
295-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.3
296-
k8s.io/endpointslice => k8s.io/endpointslice v0.30.3
297-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.3
298-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.3
299-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
300-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.3
301-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.3
302-
k8s.io/kubectl => k8s.io/kubectl v0.30.3
303-
k8s.io/kubelet => k8s.io/kubelet v0.30.3
304-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.3
305-
k8s.io/metrics => k8s.io/metrics v0.30.3
306-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.3
307-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.3
308-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.3
309-
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20240719051923-4613ee8d79ec
274+
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240814054845-978196448fb2
275+
k8s.io/api => k8s.io/api v0.31.0
276+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
277+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
278+
k8s.io/apiserver => k8s.io/apiserver v0.31.0
279+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
280+
k8s.io/client-go => k8s.io/client-go v0.31.0
281+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
282+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
283+
k8s.io/code-generator => k8s.io/code-generator v0.31.0
284+
k8s.io/component-base => k8s.io/component-base v0.31.0
285+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
286+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
287+
k8s.io/cri-api => k8s.io/cri-api v0.31.0
288+
k8s.io/cri-client => k8s.io/cri-client v0.31.0
289+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
290+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
291+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.0
292+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
293+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
294+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f
295+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
296+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
297+
k8s.io/kubectl => k8s.io/kubectl v0.31.0
298+
k8s.io/kubelet => k8s.io/kubelet v0.31.0
299+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
300+
k8s.io/metrics => k8s.io/metrics v0.31.0
301+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
302+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
303+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
304+
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20240814055642-5a8ca1345f4a
310305
)

0 commit comments

Comments
 (0)