From 87ca5d14870d310e5d6cabd33cac698cee952699 Mon Sep 17 00:00:00 2001 From: Connor Catlett Date: Fri, 10 Oct 2025 19:22:23 +0000 Subject: [PATCH] Update Windows images Signed-off-by: Connor Catlett --- Dockerfile | 9 +++++++-- Makefile | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 726fcea68c..1cc64b3487 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,12 +36,17 @@ FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:lat COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver ENTRYPOINT ["/bin/aws-ebs-csi-driver"] -FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-windows-base:1809@sha256:517651cbf291f9e38da7e06a415dbd71860a77977ff127b32be856e7594e2052 AS windows-ltsc2019 +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019@sha256:ea1b43fa8972684a5a284a6f441f91991fa7545d6912d2aecbf6c5ba60e73155 AS windows-ltsc2019 COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver.exe /aws-ebs-csi-driver.exe ENV PATH="C:\\Windows\\System32\\WindowsPowerShell\\v1.0;${PATH}" ENTRYPOINT ["/aws-ebs-csi-driver.exe"] -FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-windows-base:ltsc2022@sha256:3dda26d0d133bad3fe1edfb10ad3d98149e5504e27cc15bd4a4bed1042c483ca AS windows-ltsc2022 +FROM mcr.microsoft.com/windows/nanoserver:ltsc2022@sha256:580b7fa4040be7b47d79c25fb73e3d6da2e68f32b95d9d4dfb70bde33564fc4a AS windows-ltsc2022 +COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver.exe /aws-ebs-csi-driver.exe +ENV PATH="C:\\Windows\\System32\\WindowsPowerShell\\v1.0;${PATH}" +ENTRYPOINT ["/aws-ebs-csi-driver.exe"] + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2025@sha256:252ba371c2f50ae797d81ae9d87405b55119714817fead9f406218b556e3ddeb AS windows-ltsc2025 COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver.exe /aws-ebs-csi-driver.exe ENV PATH="C:\\Windows\\System32\\WindowsPowerShell\\v1.0;${PATH}" ENTRYPOINT ["/aws-ebs-csi-driver.exe"] diff --git a/Makefile b/Makefile index e4d4372756..82e1e0667f 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ ALL_OSVERSION_linux?=al2023 ALL_OS_ARCH_OSVERSION_linux=$(foreach arch, $(ALL_ARCH_linux), $(foreach osversion, ${ALL_OSVERSION_linux}, linux-$(arch)-${osversion})) ALL_ARCH_windows?=amd64 -ALL_OSVERSION_windows?=ltsc2019 ltsc2022 +ALL_OSVERSION_windows?=ltsc2019 ltsc2022 ltsc2025 ALL_OS_ARCH_OSVERSION_windows=$(foreach arch, $(ALL_ARCH_windows), $(foreach osversion, ${ALL_OSVERSION_windows}, windows-$(arch)-${osversion})) ALL_OS_ARCH_OSVERSION=$(foreach os, $(ALL_OS), ${ALL_OS_ARCH_OSVERSION_${os}})