From 39c412d9908266d7873ca9ccce552869a822d4de Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Wed, 2 Apr 2025 22:57:35 -0700 Subject: [PATCH] Update golang to v1.23.8 and k8s to v1.31.7 This changeset updates golang to v1.23.8 and k8s tools to v1.31.7. It also updates some dependent utilities. --- go.mod | 2 +- images/calico-go-build/Dockerfile | 23 ++++++++++------------- images/calico-go-build/versions.yaml | 12 ++++++------ 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 5e0c2929..10275ad8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/projectcalico/go-build -go 1.23.2 +go 1.23.8 require github.com/sirupsen/logrus v1.9.3 diff --git a/images/calico-go-build/Dockerfile b/images/calico-go-build/Dockerfile index e745f99d..a3b5eab5 100644 --- a/images/calico-go-build/Dockerfile +++ b/images/calico-go-build/Dockerfile @@ -8,11 +8,11 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ubi ARG TARGETARCH -ARG CONTAINERREGISTRY_VERSION=v0.20.2 -ARG CONTROLLER_TOOLS_VERSION=v0.16.5 -ARG GO_LINT_VERSION=v1.63.4 -ARG MOCKERY_VERSION=2.50.4 -ARG YQ_VERSION=v4.44.6 +ARG CONTAINERREGISTRY_VERSION=v0.20.3 +ARG CONTROLLER_TOOLS_VERSION=v0.17.3 +ARG GO_LINT_VERSION=v1.64.8 +ARG MOCKERY_VERSION=2.52.3 +ARG YQ_VERSION=v4.45.1 ENV PATH=/usr/local/go/bin:$PATH @@ -169,18 +169,15 @@ RUN set -eux; \ # Install ginkgo v2 as ginkgo2 and keep ginkgo v1 as ginkgo RUN set -eux; \ k8s_libs_version=$(yq -r .kubernetes.version /etc/versions.yaml | sed 's/^1/0/'); \ - go install github.com/onsi/ginkgo/v2/ginkgo@v2.22.2 && mv /go/bin/ginkgo /go/bin/ginkgo2 && \ + go install github.com/onsi/ginkgo/v2/ginkgo@v2.23.3 && mv /go/bin/ginkgo /go/bin/ginkgo2 && \ go install github.com/onsi/ginkgo/ginkgo@v1.16.5 && \ go install github.com/jstemmer/go-junit-report@v1.0.0 && \ - go install github.com/mikefarah/yq/v3@3.4.1 && \ - go install github.com/pmezard/licenses@v0.0.0-20160314180953-1117911df3df && \ - go install github.com/swaggo/swag/cmd/swag@v1.16.4 && \ go install github.com/wadey/gocovmerge@v0.0.0-20160331181800-b5bfa59ec0ad && \ - go install golang.org/x/tools/cmd/goimports@v0.28.0 && \ - go install golang.org/x/tools/cmd/stringer@v0.28.0 && \ + go install golang.org/x/tools/cmd/goimports@v0.31.0 && \ + go install golang.org/x/tools/cmd/stringer@v0.31.0 && \ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1 && \ - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.4 && \ - go install gotest.tools/gotestsum@v1.12.0 && \ + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.6 && \ + go install gotest.tools/gotestsum@v1.12.1 && \ go install k8s.io/code-generator/cmd/client-gen@v${k8s_libs_version} && \ go install k8s.io/code-generator/cmd/conversion-gen@v${k8s_libs_version} && \ go install k8s.io/code-generator/cmd/deepcopy-gen@v${k8s_libs_version} && \ diff --git a/images/calico-go-build/versions.yaml b/images/calico-go-build/versions.yaml index 1073dcd6..4c1f530c 100644 --- a/images/calico-go-build/versions.yaml +++ b/images/calico-go-build/versions.yaml @@ -1,12 +1,12 @@ golang: - version: 1.23.7 + version: 1.23.8 checksum: sha256: - amd64: 4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3 - arm64: 597acbd0505250d4d98c4c83adf201562a8c812cbcd7b341689a07087a87a541 - ppc64le: 3ffc310bfd11fd0bcc713a764a0f7252c4d52d03f12abebfaebaaae77e027028 - s390x: af1d4c5d01e32c2cf6e3cc00e44cb240e1a6cef539b28a64389b2b9ca284ac6c + amd64: 45b87381172a58d62c977f27c4683c8681ef36580abecd14fd124d24ca306d3f + arm64: 9d6d938422724a954832d6f806d397cf85ccfde8c581c201673e50e634fdc992 + ppc64le: 0cadab469e612b159f5f68b1a30d75aa7b7e1ed5292746005a6a3c8ff04e6f35 + s390x: cbe954ee534eb02aa782639716d8c25706dd171445f7c8336bd2fc0b8f6fe38e kubernetes: - version: 1.31.6 + version: 1.31.7 llvm: version: 18.1.8