From b44ea855f4f7d765da3ff0b117b5311e748da7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Thu, 13 Feb 2025 12:09:56 +0800 Subject: [PATCH] bump go to 1.24.0 (#4986) Signed-off-by: zhangzujian --- .github/workflows/build-x86-image.yaml | 2 +- dist/images/Dockerfile.base | 2 +- go.mod | 2 +- hack/update-codegen-docker.sh | 2 +- test/anp/go.mod | 4 ++-- test/anp/go.sum | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 199622d1928..a9c974d5f8f 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -22,7 +22,7 @@ concurrency: env: KIND_VERSION: v0.26.0 - GOLANGCI_LINT_VERSION: 'v1.63.4' + GOLANGCI_LINT_VERSION: 'v1.64.4' HELM_VERSION: v3.17.0 SUBMARINER_VERSION: '0.19.2' diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index 94d6a4cceb1..8de288e200c 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -ARG GO_VERSION=1.23.6 +ARG GO_VERSION=1.24.0 FROM ubuntu:24.04 AS ovs-builder diff --git a/go.mod b/go.mod index 6c57151d6f0..4d62583cf0f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kubeovn/kube-ovn -go 1.23.6 +go 1.24.0 require ( github.com/Microsoft/go-winio v0.6.2 diff --git a/hack/update-codegen-docker.sh b/hack/update-codegen-docker.sh index ba4aa0db1bd..b80e98f085e 100755 --- a/hack/update-codegen-docker.sh +++ b/hack/update-codegen-docker.sh @@ -7,7 +7,7 @@ GOPROXY=${GOPROXY:-"https://goproxy.cn"} docker run -it --rm \ -v ${PWD}:/app \ -e GOPROXY=${GOPROXY} \ - ghcr.io/zhangzujian/kube-code-generator:v0.5.1 \ + ghcr.io/zhangzujian/kube-code-generator:v0.5.2 \ --boilerplate-path ./hack/boilerplate.go.txt \ --apis-in ./pkg/apis \ --go-gen-out ./pkg/client diff --git a/test/anp/go.mod b/test/anp/go.mod index 23f6fe75302..cedbb879524 100644 --- a/test/anp/go.mod +++ b/test/anp/go.mod @@ -1,6 +1,6 @@ module github.com/kubeovn/kube-ovn/test/anp -go 1.23.6 +go 1.24.0 require ( gopkg.in/yaml.v3 v3.0.1 @@ -41,7 +41,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.9.0 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.34.0 // indirect + golang.org/x/net v0.35.0 // indirect golang.org/x/oauth2 v0.26.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/term v0.29.0 // indirect diff --git a/test/anp/go.sum b/test/anp/go.sum index b01cfc2692a..87f6a7f79b7 100644 --- a/test/anp/go.sum +++ b/test/anp/go.sum @@ -99,8 +99,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=