Merge branch 'master' into matlong/add-device-plugin-skeleton

Azure · Aug 5, 2024 · aed17cc · aed17cc
2 parents 96669dc + b70d041
commit aed17cc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -222,6 +222,11 @@ stages:
                 name: cni
                 os: windows
                 os_version: ltsc2022
+              cni_windows2025_amd64:
+                arch: amd64
+                name: cni
+                os: windows
+                os_version: ltsc2025
               cni_dropgz_linux_amd64:
                 arch: amd64
                 name: cni-dropgz
@@ -250,6 +255,11 @@ stages:
                 name: cns
                 os: windows
                 os_version: ltsc2022
+              cns_windows2025_amd64:
+                arch: amd64
+                name: cns
+                os: windows
+                os_version: ltsc2025
               ipv6_hp_bpf_linux_amd64:
                 arch: amd64
                 name: ipv6-hp-bpf
@@ -326,15 +336,15 @@ stages:
                 platforms: linux/amd64 linux/arm64 windows/amd64
               cni:
                 name: cni
-                os_versions: ltsc2019 ltsc2022
+                os_versions: ltsc2019 ltsc2022 ltsc2025
                 platforms: linux/amd64 linux/arm64 windows/amd64
               cni_dropgz:
                 name: cni-dropgz
                 os_versions: ltsc2019 ltsc2022
                 platforms: linux/amd64 linux/arm64 windows/amd64
               cns:
                 name: cns
-                os_versions: ltsc2019 ltsc2022
+                os_versions: ltsc2019 ltsc2022 ltsc2025
                 platforms: linux/amd64 linux/arm64 windows/amd64
               ipv6_hp_bpf:
                 name: ipv6-hp-bpf

diff --git a/Makefile b/Makefile
@@ -22,8 +22,7 @@ GOOSES   ?= "linux windows" # To override at the cli do: GOOSES="\"darwin bsd\""
 GOARCHES ?= "amd64 arm64" # To override at the cli do: GOARCHES="\"ppc64 mips\""
 ltsc2019  = "10.0.17763.4010"
 ltsc2022  = "10.0.20348.643"
-ltsc2022-KB5035857   = "10.0.26100.1"
-win2025 = "10.0.26100.1"
+ltsc2025  = "10.0.26244.5000"
 
 # Windows specific extensions
 # set these based on the GOOS, not the OS

diff --git a/cni/Dockerfile b/cni/Dockerfile
@@ -43,6 +43,15 @@ FROM scratch as linux
 COPY --from=dropgz /go/bin/dropgz dropgz
 ENTRYPOINT [ "/dropgz" ]
 
-FROM mcr.microsoft.com/windows/nanoserver:${OS_VERSION} as windows
+# intermediate for win-ltsc2019
+FROM mcr.microsoft.com/windows/nanoserver@sha256:736f8845da1c7bbc9510b419abddb870230485e74644a96e0001a21e1ca4c172 as ltsc2019
+
+# intermediate for win-ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver@sha256:cc9f6a1334190c1f18a905f56d285132e562a9a1ce18ff9476cfaf95194aa0b7 as ltsc2022
+
+# intermediate for win-ltsc2025
+FROM mcr.microsoft.com/windows/nanoserver/insider@sha256:67e0ab7f3a79cd73be4a18bae24659c03b294aed0dbeaa624feb3810931f0bd2 as ltsc2025
+
+FROM ${OS_VERSION} as windows
 COPY --from=dropgz /go/bin/dropgz dropgz.exe
 ENTRYPOINT [ "/dropgz.exe" ]
diff --git a/cns/Dockerfile b/cns/Dockerfile
@@ -28,8 +28,8 @@ FROM mcr.microsoft.com/windows/servercore@sha256:6fdf140282a2f809dae9b13fe441635
 # intermediate for win-ltsc2022
 FROM mcr.microsoft.com/windows/servercore@sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 as ltsc2022
 
-# intermediate for win2025
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-KB5035857-amd64 as win2025
+# intermediate for win-ltsc2025
+FROM mcr.microsoft.com/windows/servercore/insider@sha256:4daaf3daa404fbdebec9d88783fb343f18009ffd9c8d98c43430ca1f4e615184 as ltsc2025
 
 FROM ${OS_VERSION} as windows
 COPY --from=builder /azure-container-networking/cns/kubeconfigtemplate.yaml kubeconfigtemplate.yaml