Skip to content

Bump golang to 1.24.4 and minor utility updates #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions images/calico-go-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ubi

ARG TARGETARCH

ARG CONTAINERREGISTRY_VERSION=v0.20.3
ARG CONTAINERREGISTRY_VERSION=v0.20.5
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
ARG MOCKERY_VERSION=2.53.4
ARG YQ_VERSION=v4.45.4

ENV PATH=/usr/local/go/bin:$PATH

Expand Down Expand Up @@ -163,23 +163,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.23.3 && mv /go/bin/ginkgo /go/bin/ginkgo2 && \
go install github.com/onsi/ginkgo/v2/ginkgo@v2.23.4 && 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.31.0 && \
go install golang.org/x/tools/cmd/stringer@v0.31.0 && \
go install golang.org/x/tools/cmd/goimports@v0.33.0 && \
go install golang.org/x/tools/cmd/stringer@v0.33.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.6 && \
go install gotest.tools/gotestsum@v1.12.1 && \
go install gotest.tools/gotestsum@v1.12.2 && \
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-20241212222426-2c72e554b1e7 && \
go install mvdan.cc/gofumpt@v0.7.0
go install k8s.io/kube-openapi/cmd/openapi-gen@v0.0.0-20250318190949-c8a335a9a2ff && \
go install mvdan.cc/gofumpt@v0.8.0

# Cleanup module cache after we have built and installed all Go utilities
RUN go clean -modcache && go clean -cache
Expand Down
10 changes: 5 additions & 5 deletions images/calico-go-build/versions.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
golang:
version: 1.24.3
version: 1.24.4
checksum:
sha256:
amd64: 3333f6ea53afa971e9078895eaa4ac7204a8c6b5c68c10e6bc9a33e8e391bdd8
arm64: a463cb59382bd7ae7d8f4c68846e73c4d589f223c589ac76871b66811ded7836
ppc64le: 341a749d168f47b1d4dad25e32cae70849b7ceed7c290823b853c9e6b0df0856
s390x: a87b0c2a079a0bece1620fb29a00e02b4dba17507850f837e754af7d57cda282
amd64: 77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717
arm64: d5501ee5aca0f258d5fe9bfaed401958445014495dc115f202d43d5210b45241
ppc64le: 9ca4afef813a2578c23843b640ae0290aa54b2e3c950a6cc4c99e16a57dec2ec
s390x: 0449f3203c39703ab27684be763e9bb78ca9a051e0e4176727aead9461b6deb5
kubernetes:
version: 1.32.5
llvm:
Expand Down