Skip to content

Commit 5ac7dd7

Browse files
authored
chore: bump Go toolchain to 1.25.10 and add apk upgrade for trivy (#10231)
1 parent fec5a69 commit 5ac7dd7

7 files changed

Lines changed: 12 additions & 9 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ mod-vendor: module ## Run go mod vendor against go modules.
162162

163163
.PHONY: module
164164
module: ## Run go mod tidy->verify against go modules.
165-
$(GO) mod tidy -compat=1.24
165+
$(GO) mod tidy -compat=1.25
166166
$(GO) mod verify
167167

168168
TEST_PACKAGES ?= ./pkg/... ./apis/... ./controllers/... ./cmd/...
@@ -298,7 +298,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
298298

299299
.PHONY: reviewable
300300
reviewable: generate build-checks test check-license-header ## Run code checks to proceed with PR reviews.
301-
$(GO) mod tidy -compat=1.23
301+
$(GO) mod tidy -compat=1.25
302302

303303
.PHONY: check-diff
304304
check-diff: reviewable ## Run git code diff checker.

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build the manager binary
22
ARG DIST_IMG=gcr.io/distroless/static:nonroot
33

4-
ARG GO_VERSION=1.24.11-alpine
4+
ARG GO_VERSION=1.25.10-alpine
55

66
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS builder
77

docker/Dockerfile-charts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ RUN bash /tmp/fetch-all-helm-charts.sh deploy/helm /tmp/charts
1010

1111
FROM docker.io/alpine:3.22 AS dist
1212

13+
RUN apk upgrade --no-cache
14+
1315
COPY --from=builder /tmp/charts /charts
14-
USER 65532:65532
16+
USER 65532:65532

docker/Dockerfile-dataprotection

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build the dataprotection binary
22
ARG DIST_IMG=gcr.io/distroless/static:nonroot
33

4-
ARG GO_VERSION=1.24.11-alpine
4+
ARG GO_VERSION=1.25.10-alpine
55

66
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS builder
77

docker/Dockerfile-tools

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#TARGETARCH - Architecture from --platform, e.g. arm64
1212
#TARGETVARIANT - used to set target ARM variant, e.g. v7
1313

14-
ARG GO_VERSION=1.24.11-alpine
14+
ARG GO_VERSION=1.25.10-alpine
1515

1616
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS builder
1717
ARG TARGETOS
@@ -58,6 +58,7 @@ ARG APK_MIRROR
5858
# install tools via apk
5959
ENV APK_MIRROR=${APK_MIRROR}
6060
RUN if [ -n "${APK_MIRROR}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories; fi
61+
RUN apk upgrade --no-cache
6162
# curl is used to send certain requests, such as reload in config-manager.
6263
RUN apk add --no-cache curl kubectl helm jq --allow-untrusted \
6364
&& rm -rf /var/cache/apk/*

docker/Dockerfile-ubi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build the manager binary
22
ARG DIST_IMG=registry.access.redhat.com/ubi9:9.7
33

4-
ARG GO_VERSION=1.24.11-alpine
4+
ARG GO_VERSION=1.25.10-alpine
55

66
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS builder
77

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/apecloud/kubeblocks
22

3-
go 1.24.0
3+
go 1.25
44

5-
toolchain go1.24.11
5+
toolchain go1.25.10
66

77
require (
88
cuelang.org/go v0.8.0

0 commit comments

Comments
 (0)