Merge pull request #5962 from mboersma/update-windows-templates

k8s-ci-robot · web-flow · commit fdbf48b98e94 · 2025-11-05T16:08:52.000-08:00
Update test templates to Windows community gallery images
diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md
@@ -553,7 +553,7 @@ With the following environment variables defined, you can build a CAPZ cluster f
 | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `E2E_ARGS`                | `-kubetest.use-ci-artifacts`                                                                                                                                                                             |
 | `KUBERNETES_VERSION`      | `latest` - extract Kubernetes version from https://dl.k8s.io/ci/latest.txt (main's HEAD)<br>`latest-1.<MINOR>` - extract Kubernetes version from dl.k8s.io/ci/latest-1.<MINOR>.txt (release branch's HEAD) |
-| `WINDOWS_SERVER_VERSION`  | Optional, can be `windows-2019` (default) or `windows-2022`                                                                                                                                              |
+| `WINDOWS_SERVER_VERSION`  | Optional, can be `windows-2022` (default) or `windows-2025`                                                                                                                                              |
 | `KUBETEST_WINDOWS_CONFIG` | Default is `upstream-windows.yaml`. CAPZ contains various other configuration recipes in the `test/e2e/data/` directory; you may use any of those by referencing their file names as the value of `KUBETEST_WINDOWS_CONFIG` (e.g., `conformance-fast.yaml`), or you may drop in your own config files into `test/e2e/data/` and reference those.                                                                                                 |
 | `WINDOWS_CONTAINERD_URL`  | Optional, can be any url to a `tar.gz` file containing binaries for containerd in the same format as upstream package                                                                                    |
 
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -82,6 +82,7 @@ export AZURE_LOCATION_EDGEZONE="${AZURE_LOCATION_EDGEZONE:-$(capz::util::get_ran
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s"}"
 export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
 export WINDOWS="${WINDOWS:-false}"
+export WINDOWS_SERVER_VERSION="${WINDOWS_SERVER_VERSION:-windows-2022}"
 AZWI_RESOURCE_GROUP="${AZWI_RESOURCE_GROUP:-capz-wi-$(capz::util::random_suffix)}"
 export AZWI_RESOURCE_GROUP
 
diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -72,6 +72,7 @@ CALICO_VERSION=$(make get-calico-version)
 export CALICO_VERSION
 AZWI_RESOURCE_GROUP="${AZWI_RESOURCE_GROUP:-capz-wi-$(capz::util::random_suffix)}"
 export AZWI_RESOURCE_GROUP
+export WINDOWS_SERVER_VERSION="${WINDOWS_SERVER_VERSION:-windows-2022}"
 
 
 capz::util::generate_ssh_key
diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh
@@ -119,6 +119,7 @@ setup() {
     # TODO figure out a better way to account for expected Windows node count
     if [[ "${TEST_WINDOWS:-}" == "true" ]]; then
         export WINDOWS_WORKER_MACHINE_COUNT="${WINDOWS_WORKER_MACHINE_COUNT:-2}"
+        export WINDOWS_SERVER_VERSION="${WINDOWS_SERVER_VERSION:-windows-2022}"
     fi
 }
 
diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml
diff --git a/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-windows.yaml b/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-windows.yaml
@@ -8,11 +8,10 @@ spec:
       image:
         # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
         # the binaries and images will get replaced to the desired version by the pre-kubeadm script.
-        marketplace:
-          publisher: cncf-upstream
-          offer: capi-windows
-          sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
-          version: "latest"
+        computeGallery:
+          gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+          name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
+          version: latest
       identity: UserAssigned
       userAssignedIdentities:
       - providerID: azure:///subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${CI_RG}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${USER_IDENTITY}
diff --git a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
@@ -8,11 +8,10 @@ spec:
       image:
         # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
         # the binaries and images will get replaced to the desired version by the pre-kubeadm script.
-        marketplace:
-          publisher: cncf-upstream
-          offer: capi-windows
-          sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
-          version: "latest"
+        computeGallery:
+          gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+          name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
+          version: latest
       identity: UserAssigned
       userAssignedIdentities:
       - providerID: azure:///subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${CI_RG}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${USER_IDENTITY}
diff --git a/templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version-windows.yaml b/templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version-windows.yaml
@@ -8,10 +8,9 @@ spec:
     image:
       # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
       # latest binaries and images will get replaced to the desired version by the script in this template.
-      marketplace:
-        publisher: cncf-upstream
-        offer: capi-windows
-        sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+      computeGallery:
+        gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+        name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
         version: latest
   identity: UserAssigned
   userAssignedIdentities:
diff --git a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version-windows.yaml b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version-windows.yaml
@@ -8,10 +8,9 @@ spec:
     image:
       # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
       # latest binaries and images will get replaced to the desired version by the script in this template.
-      marketplace:
-        publisher: cncf-upstream
-        offer: capi-windows
-        sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+      computeGallery:
+        gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+        name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
         version: latest
   identity: UserAssigned
   userAssignedIdentities:
diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml
diff --git a/templates/test/dev/cluster-template-custom-builds-windows.yaml b/templates/test/dev/cluster-template-custom-builds-windows.yaml
diff --git a/templates/test/dev/custom-builds-machine-pool-windows/patches/machine-pool-deployment-pr-version-windows.yaml b/templates/test/dev/custom-builds-machine-pool-windows/patches/machine-pool-deployment-pr-version-windows.yaml
@@ -7,8 +7,7 @@ spec:
     image:
       # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
       # latest binaries and images will get replaced to the desired version by the script above.
-      marketplace:
-        publisher: cncf-upstream
-        offer: capi-windows
-        sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+      computeGallery:
+        gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+        name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
         version: latest
diff --git a/templates/test/dev/custom-builds-machine-pool/patches/machine-pool-deployment-pr-version-windows.yaml b/templates/test/dev/custom-builds-machine-pool/patches/machine-pool-deployment-pr-version-windows.yaml
@@ -7,8 +7,7 @@ spec:
     image:
       # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
       # latest binaries and images will get replaced to the desired version by the script above.
-      marketplace:
-        publisher: cncf-upstream
-        offer: capi-windows
-        sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+      computeGallery:
+        gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+        name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
         version: latest
diff --git a/templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version-windows.yaml b/templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version-windows.yaml
@@ -12,8 +12,7 @@ spec:
       image:
         # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
         # latest binaries and images will get replaced to the desired version by the script above.
-        marketplace:
-          publisher: cncf-upstream
-          offer: capi-windows
-          sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+        computeGallery:
+          gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+          name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
           version: latest
diff --git a/templates/test/dev/custom-builds/patches/machine-deployment-pr-version-windows.yaml b/templates/test/dev/custom-builds/patches/machine-deployment-pr-version-windows.yaml
@@ -12,8 +12,7 @@ spec:
       image:
         # we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
         # latest binaries and images will get replaced to the desired version by the script above.
-        marketplace:
-          publisher: cncf-upstream
-          offer: capi-windows
-          sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+        computeGallery:
+          gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+          name: capi-win-${WINDOWS_SERVER_VERSION#windows-}-containerd
           version: latest

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ setup() {`
`119`	`119`	`# TODO figure out a better way to account for expected Windows node count`
`120`	`120`	`if [[ "${TEST_WINDOWS:-}" == "true" ]]; then`
`121`	`121`	`export WINDOWS_WORKER_MACHINE_COUNT="${WINDOWS_WORKER_MACHINE_COUNT:-2}"`
	`122`	`+ export WINDOWS_SERVER_VERSION="${WINDOWS_SERVER_VERSION:-windows-2022}"`
`122`	`123`	`fi`
`123`	`124`	`}`
`124`	`125`