Skip to content

Commit 0df5507

Browse files
shanshanyingapecloud-bot
authored andcommitted
chore: bump Go toolchain to 1.25.10 and add apk upgrade for trivy (#10231)
(cherry picked from commit 5ac7dd7)
1 parent f03b973 commit 0df5507

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
@@ -164,7 +164,7 @@ mod-vendor: module ## Run go mod vendor against go modules.
164164

165165
.PHONY: module
166166
module: ## Run go mod tidy->verify against go modules.
167-
$(GO) mod tidy -compat=1.24
167+
$(GO) mod tidy -compat=1.25
168168
$(GO) mod verify
169169

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

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

305305
.PHONY: check-diff
306306
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
@@ -64,6 +64,7 @@ ARG APK_MIRROR
6464
# install tools via apk
6565
ENV APK_MIRROR=${APK_MIRROR}
6666
RUN if [ -n "${APK_MIRROR}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories; fi
67+
RUN apk upgrade --no-cache
6768
# curl is used to send certain requests, such as reload in config-manager.
6869
RUN apk add --no-cache curl kubectl helm jq --allow-untrusted \
6970
&& 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)