Skip to content

Commit c22f7bb

Browse files
authored
Merge pull request #1920 from aramase/automated-cherry-pick-of-#1915-upstream-release-1.5
chore: update to go 1.24.7 and bump base image
2 parents 14f7660 + 6665902 commit c22f7bb

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

docker/BASEIMAGE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base:bookworm-v1.0.5
2-
linux/arm64=registry.k8s.io/build-image/debian-base:bookworm-v1.0.5
1+
linux/amd64=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
2+
linux/arm64=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
33
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
44
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022
55
windows/amd64/ltsc2025=mcr.microsoft.com/windows/nanoserver:ltsc2025

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.5
15+
ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
1616

17-
FROM golang:1.23.10@sha256:dd5cc4b4f85d13329cb5b17cbf35c509e1c82a43bf6e5961516fda444013121a AS builder
17+
FROM golang:1.24.7@sha256:87916acb3242b6259a26deaa7953bdc6a3a6762a28d340e4f1448e7b5c27c009 AS builder
1818
WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver
1919
ADD . .
2020
ARG TARGETARCH

docker/crd.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
FROM alpine as builder
16-
ARG KUBE_VERSION=v1.29.11
16+
ARG KUBE_VERSION=v1.34.1
1717
ARG TARGETARCH
1818

1919
RUN apk add --no-cache curl && \

docker/windows.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG BASEIMAGE_CORE=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1
1717

1818
FROM --platform=linux/amd64 ${BASEIMAGE_CORE} AS core
1919

20-
FROM --platform=$BUILDPLATFORM golang:1.23.10@sha256:dd5cc4b4f85d13329cb5b17cbf35c509e1c82a43bf6e5961516fda444013121a AS builder
20+
FROM --platform=$BUILDPLATFORM golang:1.24.7@sha256:87916acb3242b6259a26deaa7953bdc6a3a6762a28d340e4f1448e7b5c27c009 AS builder
2121
WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver
2222
ADD . .
2323
ARG TARGETARCH

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/secrets-store-csi-driver
22

3-
go 1.23.10
3+
go 1.24.7
44

55
require (
66
github.com/container-storage-interface/spec v1.6.0

hack/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/secrets-store-csi-driver/hack/tools
22

3-
go 1.24.2
3+
go 1.24.7
44

55
require (
66
github.com/golangci/golangci-lint v1.64.8

test/e2eprovider/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23.10@sha256:dd5cc4b4f85d13329cb5b17cbf35c509e1c82a43bf6e5961516fda444013121a as builder
15+
FROM golang:1.24.7@sha256:87916acb3242b6259a26deaa7953bdc6a3a6762a28d340e4f1448e7b5c27c009 as builder
1616
WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver
1717
ADD . .
1818
RUN make build-e2e-provider

test/e2eprovider/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/secrets-store-csi-driver/test/e2eprovider
22

3-
go 1.23.10
3+
go 1.24.7
44

55
replace sigs.k8s.io/secrets-store-csi-driver => ../..
66

0 commit comments

Comments
 (0)