Default to windows-2025 community gallery images

Author: mboersma

azure/defaults.go

@@ -52,7 +52,7 @@ const (
 	// DefaultLinuxGalleryImageName is the default Linux community gallery image definition.
 	DefaultLinuxGalleryImageName = "capi-ubun2-2404"
 	// DefaultWindowsGalleryImageName is the default Windows community gallery image definition.
-	DefaultWindowsGalleryImageName = "capi-win-2019-containerd"
+	DefaultWindowsGalleryImageName = "capi-win-2025-containerd"
 )
 
 const (
@@ -72,7 +72,7 @@ const (
 const (
 	// DefaultWindowsOsAndVersion is the default Windows Server version to use when
 	// generating default images for Windows nodes.
-	DefaultWindowsOsAndVersion = "windows-2019"
+	DefaultWindowsOsAndVersion = "windows-2025"
 )
 
 const (

azure/services/virtualmachineimages/images.go

@@ -106,7 +106,7 @@ func (s *Service) GetDefaultWindowsImage(ctx context.Context, _, k8sVersion, run
 		if len(match) != 2 {
 			return nil, errors.Errorf("unsupported osAndVersion %s", osAndVersion)
 		}
-		imageName = strings.Replace(imageName, "2019", match[1], 1)
+		imageName = strings.Replace(imageName, "2025", match[1], 1)
 	}
 
 	// Use the Azure Marketplace for specific older versions, to keep "clusterctl upgrade" from rolling new machines.

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-2025` (default) or `windows-2022`                                                                                                                                              |
 | `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                                                                                    |
 

templates/test/ci/cluster-template-prow-ci-version.yaml

@@ -11,7 +11,7 @@ spec:
         marketplace:
           publisher: cncf-upstream
           offer: capi-windows
-          sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+          sku: ${WINDOWS_SERVER_VERSION:=windows-2025}-containerd-gen1
           version: "latest"
       identity: UserAssigned
       userAssignedIdentities:

templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml

@@ -11,7 +11,7 @@ spec:
       marketplace:
         publisher: cncf-upstream
         offer: capi-windows
-        sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+        sku: ${WINDOWS_SERVER_VERSION:=windows-2025}-containerd-gen1
         version: latest
   identity: UserAssigned
   userAssignedIdentities:

templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml

@@ -10,5 +10,5 @@ spec:
       marketplace:
         publisher: cncf-upstream
         offer: capi-windows
-        sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+        sku: ${WINDOWS_SERVER_VERSION:=windows-2025}-containerd-gen1
         version: latest

templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version-windows.yaml

@@ -15,5 +15,5 @@ spec:
         marketplace:
           publisher: cncf-upstream
           offer: capi-windows
-          sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
+          sku: ${WINDOWS_SERVER_VERSION:=windows-2025}-containerd-gen1
           version: latest