Skip to content

Commit 959c0b6

Browse files
zhangzujianzhangzujian
authored
bump go to 1.23.7 (#5077)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 3e7b784 commit 959c0b6

File tree

8 files changed

+215
-207
lines changed

8 files changed

+215
-207
lines changed

‎.github/workflows/build-x86-image.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ concurrency:
2121
cancel-in-progress: true
2222

2323
env:
24-
KIND_VERSION: v0.26.0
25-
GOLANGCI_LINT_VERSION: 'v1.62.2'
24+
KIND_VERSION: v0.27.0
25+
GOLANGCI_LINT_VERSION: 'v1.64.7'
2626
HELM_VERSION: v3.16.4
2727
SUBMARINER_VERSION: '0.18.3'
2828

‎dist/images/Dockerfile.base

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax = docker/dockerfile:experimental
2-
ARG GO_VERSION=1.23.6
2+
ARG GO_VERSION=1.23.7
33

44
FROM ubuntu:24.04 AS ovs-builder
55

@@ -112,8 +112,8 @@ FROM ghcr.io/aquasecurity/trivy:latest AS trivy
112112

113113
ARG ARCH
114114
ENV CNI_PLUGINS_VERSION="v1.6.2"
115-
ENV KUBECTL_VERSION="v1.31.5"
116-
ENV GOBGP_VERSION="3.34.0"
115+
ENV KUBECTL_VERSION="v1.31.7"
116+
ENV GOBGP_VERSION="3.35.0"
117117
ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2"
118118

119119
RUN apk --no-cache add curl jq

‎dist/images/go-deps/download-go-deps.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44

55
ARCH=${ARCH:-amd64}
66
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.6.2}
7-
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.31.5}
8-
GOBGP_VERSION=${GOBGP_VERSION:-3.34.0}
7+
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.31.7}
8+
GOBGP_VERSION=${GOBGP_VERSION:-3.35.0}
99

1010

1111
DEPS_DIR=/godeps

‎go.mod

+80-79
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/kubeovn/kube-ovn
22

3-
go 1.23.6
3+
go 1.23.7
44

55
require (
66
github.com/Microsoft/go-winio v0.6.2
77
github.com/Microsoft/hcsshim v0.12.9
88
github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e
99
github.com/cenkalti/backoff/v4 v4.3.0
1010
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08
11-
github.com/containerd/containerd v1.7.24
11+
github.com/containerd/containerd v1.7.26
1212
github.com/containernetworking/cni v1.2.3
1313
github.com/containernetworking/plugins v1.6.2
14-
github.com/docker/docker v27.5.1+incompatible
14+
github.com/docker/docker v28.0.1+incompatible
1515
github.com/emicklei/go-restful/v3 v3.12.1
1616
github.com/evanphx/json-patch/v5 v5.9.11
1717
github.com/go-logr/logr v1.4.2
@@ -27,7 +27,7 @@ require (
2727
github.com/moby/sys/mountinfo v0.7.2
2828
github.com/onsi/ginkgo/v2 v2.22.2
2929
github.com/onsi/gomega v1.36.2
30-
github.com/osrg/gobgp/v3 v3.34.0
30+
github.com/osrg/gobgp/v3 v3.35.0
3131
github.com/ovn-org/libovsdb v0.7.0
3232
github.com/parnurzeal/gorequest v0.3.0
3333
github.com/prometheus-community/pro-bing v0.6.1
@@ -39,29 +39,29 @@ require (
3939
github.com/stretchr/testify v1.10.0
4040
github.com/vishvananda/netlink v1.3.0
4141
go.uber.org/mock v0.5.0
42-
golang.org/x/mod v0.23.0
43-
golang.org/x/sys v0.30.0
44-
golang.org/x/time v0.10.0
45-
google.golang.org/grpc v1.70.0
42+
golang.org/x/mod v0.24.0
43+
golang.org/x/sys v0.31.0
44+
golang.org/x/time v0.11.0
45+
google.golang.org/grpc v1.71.0
4646
google.golang.org/protobuf v1.36.5
4747
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.1.4
48-
k8s.io/api v0.31.6
49-
k8s.io/apiextensions-apiserver v0.31.6
50-
k8s.io/apimachinery v0.31.6
48+
k8s.io/api v0.31.7
49+
k8s.io/apiextensions-apiserver v0.31.7
50+
k8s.io/apimachinery v0.31.7
5151
k8s.io/client-go v12.0.0+incompatible
5252
k8s.io/klog/v2 v2.130.1
53-
k8s.io/kubernetes v1.31.6
53+
k8s.io/kubernetes v1.31.7
5454
k8s.io/utils v0.0.0-20241210054802-24370beab758
55-
kernel.org/pub/linux/libs/security/libcap/cap v1.2.73
55+
kernel.org/pub/linux/libs/security/libcap/cap v1.2.75
5656
kubevirt.io/api v1.4.0
5757
kubevirt.io/client-go v1.4.0
5858
kubevirt.io/kubevirt v1.4.0
59-
sigs.k8s.io/controller-runtime v0.19.6
59+
sigs.k8s.io/controller-runtime v0.19.7
6060
sigs.k8s.io/network-policy-api v0.1.5
6161
)
6262

6363
require (
64-
cel.dev/expr v0.19.0 // indirect
64+
cel.dev/expr v0.19.1 // indirect
6565
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6666
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6767
github.com/beorn7/perks v1.0.1 // indirect
@@ -70,12 +70,12 @@ require (
7070
github.com/cenkalti/hub v1.0.2 // indirect
7171
github.com/cenkalti/rpc2 v1.0.0 // indirect
7272
github.com/cespare/xxhash/v2 v2.3.0 // indirect
73-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
74-
github.com/containerd/continuity v0.4.3 // indirect
75-
github.com/containerd/errdefs v0.3.0 // indirect
73+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
74+
github.com/containerd/continuity v0.4.5 // indirect
75+
github.com/containerd/errdefs v1.0.0 // indirect
7676
github.com/containerd/errdefs/pkg v0.3.0 // indirect
7777
github.com/containerd/log v0.1.0 // indirect
78-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
78+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
7979
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8080
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
8181
github.com/eapache/channels v1.1.0 // indirect
@@ -88,23 +88,23 @@ require (
8888
github.com/go-kit/kit v0.13.0 // indirect
8989
github.com/go-kit/log v0.2.1 // indirect
9090
github.com/go-logfmt/logfmt v0.6.0 // indirect
91-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
91+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
9292
github.com/go-openapi/jsonreference v0.21.0 // indirect
93-
github.com/go-openapi/swag v0.23.0 // indirect
93+
github.com/go-openapi/swag v0.23.1 // indirect
9494
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9595
github.com/godbus/dbus/v5 v5.1.0 // indirect
9696
github.com/gogo/protobuf v1.3.2 // indirect
9797
github.com/golang/glog v1.2.4 // indirect
98-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
98+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
9999
github.com/golang/mock v1.6.0 // indirect
100100
github.com/golang/protobuf v1.5.4 // indirect
101-
github.com/google/cel-go v0.22.1 // indirect
102-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
103-
github.com/google/go-cmp v0.6.0 // indirect
101+
github.com/google/cel-go v0.24.1 // indirect
102+
github.com/google/gnostic-models v0.6.9 // indirect
103+
github.com/google/go-cmp v0.7.0 // indirect
104104
github.com/google/gofuzz v1.2.0 // indirect
105-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
105+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 // indirect
106106
github.com/gorilla/websocket v1.5.3 // indirect
107-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
107+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
108108
github.com/hashicorp/go-version v1.7.0 // indirect
109109
github.com/hashicorp/hcl v1.0.0 // indirect
110110
github.com/imdario/mergo v0.3.16 // indirect
@@ -116,10 +116,10 @@ require (
116116
github.com/k-sone/critbitgo v1.4.0 // indirect
117117
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
118118
github.com/kelseyhightower/envconfig v1.4.0 // indirect
119-
github.com/klauspost/compress v1.17.11 // indirect
119+
github.com/klauspost/compress v1.18.0 // indirect
120120
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
121121
github.com/magiconair/properties v1.8.7 // indirect
122-
github.com/mailru/easyjson v0.7.7 // indirect
122+
github.com/mailru/easyjson v0.9.0 // indirect
123123
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 // indirect
124124
github.com/mdlayher/packet v1.1.2 // indirect
125125
github.com/mdlayher/socket v0.5.1 // indirect
@@ -160,38 +160,39 @@ require (
160160
github.com/vishvananda/netns v0.0.5 // indirect
161161
github.com/x448/float16 v0.8.4 // indirect
162162
go.opencensus.io v0.24.0 // indirect
163-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
164-
go.opentelemetry.io/otel v1.32.0 // indirect
165-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
166-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
167-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
168-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
169-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
170-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
163+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
164+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
165+
go.opentelemetry.io/otel v1.35.0 // indirect
166+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
167+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
168+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
169+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
170+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
171+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
171172
go.uber.org/multierr v1.11.0 // indirect
172173
go.uber.org/zap v1.27.0 // indirect
173-
golang.org/x/exp v0.0.0-20250215185904-eff6e970281f // indirect
174-
golang.org/x/net v0.35.0 // indirect
175-
golang.org/x/oauth2 v0.26.0 // indirect
176-
golang.org/x/sync v0.11.0 // indirect
177-
golang.org/x/term v0.29.0 // indirect
178-
golang.org/x/text v0.22.0 // indirect
179-
golang.org/x/tools v0.30.0 // indirect
174+
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
175+
golang.org/x/net v0.37.0 // indirect
176+
golang.org/x/oauth2 v0.28.0 // indirect
177+
golang.org/x/sync v0.12.0 // indirect
178+
golang.org/x/term v0.30.0 // indirect
179+
golang.org/x/text v0.23.0 // indirect
180+
golang.org/x/tools v0.31.0 // indirect
180181
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
181-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
182-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
182+
google.golang.org/genproto/googleapis/api v0.0.0-20250311190419-81fb87f6b8bf // indirect
183+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf // indirect
183184
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
184185
gopkg.in/inf.v0 v0.9.1 // indirect
185186
gopkg.in/ini.v1 v1.67.0 // indirect
186187
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
187188
gopkg.in/yaml.v2 v2.4.0 // indirect
188189
gopkg.in/yaml.v3 v3.0.1 // indirect
189190
gotest.tools/v3 v3.0.2 // indirect
190-
k8s.io/apiserver v0.31.6 // indirect
191-
k8s.io/component-base v0.31.6 // indirect
192-
k8s.io/kube-aggregator v0.31.6 // indirect
193-
k8s.io/kube-openapi v0.31.6 // indirect
194-
kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect
191+
k8s.io/apiserver v0.31.7 // indirect
192+
k8s.io/component-base v0.31.7 // indirect
193+
k8s.io/kube-aggregator v0.31.7 // indirect
194+
k8s.io/kube-openapi v0.31.7 // indirect
195+
kernel.org/pub/linux/libs/security/libcap/psx v1.2.75 // indirect
195196
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
196197
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
197198
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
@@ -205,34 +206,34 @@ replace (
205206
github.com/openshift/api => github.com/openshift/api v0.0.0-20191219222812-2987a591a72c
206207
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
207208
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240814054845-978196448fb2
208-
k8s.io/api => k8s.io/api v0.31.6
209-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6
210-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.6
211-
k8s.io/apiserver => k8s.io/apiserver v0.31.6
212-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.6
213-
k8s.io/client-go => k8s.io/client-go v0.31.6
214-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6
215-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6
216-
k8s.io/code-generator => k8s.io/code-generator v0.31.6
217-
k8s.io/component-base => k8s.io/component-base v0.31.6
218-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.6
219-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.6
220-
k8s.io/cri-api => k8s.io/cri-api v0.31.6
221-
k8s.io/cri-client => k8s.io/cri-client v0.31.6
222-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6
223-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6
224-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.6
225-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6
226-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6
209+
k8s.io/api => k8s.io/api v0.31.7
210+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.7
211+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.7
212+
k8s.io/apiserver => k8s.io/apiserver v0.31.7
213+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.7
214+
k8s.io/client-go => k8s.io/client-go v0.31.7
215+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.7
216+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.7
217+
k8s.io/code-generator => k8s.io/code-generator v0.31.7
218+
k8s.io/component-base => k8s.io/component-base v0.31.7
219+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.7
220+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.7
221+
k8s.io/cri-api => k8s.io/cri-api v0.31.7
222+
k8s.io/cri-client => k8s.io/cri-client v0.31.7
223+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.7
224+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.7
225+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.7
226+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.7
227+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.7
227228
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f
228-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6
229-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6
230-
k8s.io/kubectl => k8s.io/kubectl v0.31.6
231-
k8s.io/kubelet => k8s.io/kubelet v0.31.6
232-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.6
233-
k8s.io/metrics => k8s.io/metrics v0.31.6
234-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.6
235-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6
236-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6
229+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.7
230+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.7
231+
k8s.io/kubectl => k8s.io/kubectl v0.31.7
232+
k8s.io/kubelet => k8s.io/kubelet v0.31.7
233+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.7
234+
k8s.io/metrics => k8s.io/metrics v0.31.7
235+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.7
236+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.7
237+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.7
237238
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20241128091559-882afb5db2f6
238239
)

0 commit comments

Comments
 (0)