From 3df659897f7f3a8c3ebbf37c768ce9fb35ca1ada Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Tue, 2 Dec 2025 08:50:08 -0800 Subject: [PATCH 1/4] Bump golang to v1.25.5 --- images/calico-go-build/versions.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/calico-go-build/versions.yaml b/images/calico-go-build/versions.yaml index 677c4a9..e632d92 100644 --- a/images/calico-go-build/versions.yaml +++ b/images/calico-go-build/versions.yaml @@ -1,11 +1,11 @@ golang: - version: 1.25.4 + version: 1.25.5 checksum: sha256: - amd64: 9fa5ffeda4170de60f67f3aa0f824e426421ba724c21e133c1e35d6159ca1bec - arm64: a68e86d4b72c2c2fecf7dfed667680b6c2a071221bbdb6913cf83ce3f80d9ff0 - ppc64le: 38c8ac8463537c99fbc1ef368f243b626144446c09db71b1d20634a4237c966d - s390x: 2482e7b3b924348b120b6d7d7c13035905c009c2a3ecc0c8dc56bf0fd3184a58 + amd64: 9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b + arm64: b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9 + ppc64le: f0904b647b5b8561efc5d48bb59a34f2b7996afab83ccd41c93b1aeb2c0067e4 + s390x: a5d0a72b0dfd57f9c2c0cdd8b7e0f401e0afb9e8c304d3410f9b0982ce0953da kubernetes: version: 1.34.1 llvm: From bd53fd2da6876a6c3fe7b9efefc2eacea07bde66 Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Tue, 2 Dec 2025 08:50:30 -0800 Subject: [PATCH 2/4] Bump k8s libs to v1.34.2 --- images/calico-go-build/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/calico-go-build/versions.yaml b/images/calico-go-build/versions.yaml index e632d92..3ec11bf 100644 --- a/images/calico-go-build/versions.yaml +++ b/images/calico-go-build/versions.yaml @@ -7,6 +7,6 @@ golang: ppc64le: f0904b647b5b8561efc5d48bb59a34f2b7996afab83ccd41c93b1aeb2c0067e4 s390x: a5d0a72b0dfd57f9c2c0cdd8b7e0f401e0afb9e8c304d3410f9b0982ce0953da kubernetes: - version: 1.34.1 + version: 1.34.2 llvm: version: 18.1.8 From a9f0067777f26e7520e984a4f416befab2bd4311 Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Tue, 2 Dec 2025 08:54:43 -0800 Subject: [PATCH 3/4] Update Go utilities --- images/calico-go-build/Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/calico-go-build/Dockerfile b/images/calico-go-build/Dockerfile index fd629e9..4497cf1 100644 --- a/images/calico-go-build/Dockerfile +++ b/images/calico-go-build/Dockerfile @@ -6,12 +6,12 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ubi ARG TARGETARCH -ARG CONTAINERREGISTRY_VERSION=v0.20.6 +ARG CONTAINERREGISTRY_VERSION=v0.20.7 ARG CONTROLLER_TOOLS_VERSION=v0.18.0 -ARG GO_LINT_VERSION=v2.5.0 -ARG MOCKERY_VERSION=3.5.4 -ARG PROTOC_VERSION=32.1 -ARG YQ_VERSION=v4.48.1 +ARG GO_LINT_VERSION=v2.6.2 +ARG MOCKERY_VERSION=3.5.5 +ARG PROTOC_VERSION=33.1 +ARG YQ_VERSION=v4.49.2 ENV PATH=/usr/local/go/bin:$PATH @@ -196,23 +196,23 @@ 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.25.2 && mv /go/bin/ginkgo /go/bin/ginkgo2 && \ + go install github.com/onsi/ginkgo/v2/ginkgo@v2.27.2 && 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/wadey/gocovmerge@v0.0.0-20160331181800-b5bfa59ec0ad && \ - go install golang.org/x/tools/cmd/goimports@v0.36.0 && \ - go install golang.org/x/tools/cmd/stringer@v0.36.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.8 && \ - go install gotest.tools/gotestsum@v1.12.3 && \ + go install golang.org/x/tools/cmd/goimports@v0.39.0 && \ + go install golang.org/x/tools/cmd/stringer@v0.39.0 && \ + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.6.0 && \ + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.10 && \ + go install gotest.tools/gotestsum@v1.13.0 && \ 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} && \ go install k8s.io/code-generator/cmd/defaulter-gen@v${k8s_libs_version} && \ go install k8s.io/code-generator/cmd/informer-gen@v${k8s_libs_version} && \ go install k8s.io/code-generator/cmd/lister-gen@v${k8s_libs_version} && \ - go install k8s.io/kube-openapi/cmd/openapi-gen@v0.0.0-20250902184714-7fc278399c7f && \ - go install mvdan.cc/gofumpt@v0.8.0 + go install k8s.io/kube-openapi/cmd/openapi-gen@v0.0.0-20251125145642-4e65d59e963e && \ + go install mvdan.cc/gofumpt@v0.9.2 # Cleanup module cache after we have built and installed all Go utilities RUN go clean -modcache && go clean -cache From a9b506a042afb5a9915dd8c256e4c2c9783412e2 Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Tue, 2 Dec 2025 08:55:28 -0800 Subject: [PATCH 4/4] Update top-level go mods --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 44bb7e8..25ab11c 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/projectcalico/go-build -go 1.25.2 +go 1.25.5 require github.com/sirupsen/logrus v1.9.3 -require golang.org/x/sys v0.35.0 // indirect +require golang.org/x/sys v0.38.0 // indirect diff --git a/go.sum b/go.sum index b1a1d5b..f81e214 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=