feat(windows): add Windows 2025 support for Windows Cilium Networking (WCN) by rzlink · Pull Request #7778 · Azure/AgentBaker

rzlink · 2026-02-03T17:41:30Z

/kind feature

What this PR does / why we need it:
This enables Windows 2025 VHDs to download and cache the WCN package (v1.3.0) during VHD build, following the same pattern as Windows 23H2.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Release note:

Add Windows 2025 Cilium Networking (WCN) feature

Copilot

Pull request overview

Adds Windows Server 2025 coverage for Windows Cilium Networking (WCN) so VHD build can download/cache the WCN package (mirroring the existing Windows 23H2 behavior), and extends snapshot/e2e scenarios to validate the generated Windows CSE artifacts.

Changes:

Extend components.json WCN OCI artifact selection to include Windows SKU 2025* (v1.3.0).
Add new Windows 2025 Gen2 NextGenNetworking snapshot test cases (enabled / enabled-no-config / disabled) and corresponding expected CustomData + CSECommand outputs.
Add a (currently skipped) e2e scenario for Windows 2025 Gen2 with WCN enabled.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
`parts/common/components.json`	Adds `windowsSkuMatch: "2025*"` for the WCN OCI artifact so Windows 2025 VHD builds cache the package.
`pkg/agent/baker_test.go`	Adds snapshot test entries for Windows 2025 Gen2 NextGenNetworking variants to validate generated outputs.
`pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CustomData`	New expected Windows CSE CustomData output with WCN enabled + config.
`pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CSECommand`	New expected CSE command output for the Windows 2025 Gen2 NextGenNetworking case.
`pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingNoConfig/CustomData`	New expected Windows CSE CustomData output with WCN enabled + empty config.
`pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingNoConfig/CSECommand`	New expected CSE command output for the “enabled but no config” case.
`pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingDisabled/CustomData`	New expected Windows CSE CustomData output with WCN disabled.
`pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingDisabled/CSECommand`	New expected CSE command output for the WCN-disabled case.
`e2e/scenario_win_test.go`	Adds a skipped e2e scenario wiring NextGenNetworking/WCN on Windows 2025 Gen2 for future enablement.

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CustomData

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingNoConfig/CustomData

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingDisabled/CustomData

timmy-wright

I'm not sure why we needed the generated data update - it shouldn't be necessary for this PR. But if it was needed, then it was needed.

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 4 comments.

parts/common/components.json

Copilot · 2026-04-07T21:24:19Z

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingNoConfig/CustomData

+        $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
+        Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"


Typo in variable name: $turncatedErrorMessage should be $truncatedErrorMessage for readability/maintainability. Since this is generated CustomData, the fix likely belongs in the source template (and then re-run generation) rather than editing the snapshot directly.

Suggested change

$turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))

Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"

$truncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))

Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$truncatedErrorMessage|"

Copilot · 2026-04-07T21:24:19Z

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworkingDisabled/CustomData

+        $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
+        Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"


Typo in variable name: $turncatedErrorMessage should be $truncatedErrorMessage for readability/maintainability. Since this is generated CustomData, the fix likely belongs in the source template (and then re-run generation) rather than editing the snapshot directly.

Suggested change

$turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))

Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"

$truncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))

Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$truncatedErrorMessage|"

Copilot · 2026-04-07T21:24:19Z

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CustomData

+        $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
+        Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"


Typo in variable name: $turncatedErrorMessage should be $truncatedErrorMessage for readability/maintainability. Since this is generated CustomData, the fix likely belongs in the source template (and then re-run generation) rather than editing the snapshot directly.

Suggested change

$turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))

Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"

$truncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))

Set-Content -Path $completionFilePath -Value "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$truncatedErrorMessage|"

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.

Copilot · 2026-04-08T20:43:04Z

parts/common/components.json

          "renovateTag": "<DO_NOT_UPDATE>",
          "latestVersion": "1.3.0",
          "windowsSkuMatch": "23H2*"
+        },
+        {
+          "renovateTag": "<DO_NOT_UPDATE>",
+          "latestVersion": "1.6.0",
+          "windowsSkuMatch": "2025*"


The PR description says Windows 2025 will download/cache WCN package v1.3.0, but components.json selects latestVersion: 1.6.0 for windowsSkuMatch: 2025*. Please align the PR description with the actual version being introduced (or adjust the component version if 1.3.0 is intended for 2025).

Copilot · 2026-04-08T20:43:05Z

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CustomData

+    # Determine the CSE package URL
+    $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-current.zip"
+    # CSEScriptsPackage is cached on VHD. Previously the cse package version was managed in components.json, whereas RP set the package URL which is a storage account.
+    # From 2025-06 The CSE packages is eleased on the VHD. RP can use fully qualified URL to download CSE scripts package when required out of VHD release cycle.


Correct spelling in comment: 'eleased' -> 'released'.

Suggested change

# From 2025-06 The CSE packages is eleased on the VHD. RP can use fully qualified URL to download CSE scripts package when required out of VHD release cycle.

# From 2025-06 The CSE packages is released on the VHD. RP can use fully qualified URL to download CSE scripts package when required out of VHD release cycle.

Copilot · 2026-04-08T20:43:05Z

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CustomData

+        Notes on modifying this file:
+        - This file extension is PS1, but it is actually used as a template from pkg/engine/template_generator.go
+        - All of the lines that have braces in them will be modified. Please do not change them here, change them in the Go sources
+        - Single quotes are forbidden, they are reserved to delineate the different members for the ARM template concat() call


This header states “Single quotes are forbidden”, but this generated fixture contains multiple single-quoted strings later in the script. Please either update the header comment to reflect current constraints for these testdata fixtures, or regenerate/adjust the fixture so it actually complies with the stated template restrictions (to avoid future edits being guided by incorrect rules).

Suggested change

- Single quotes are forbidden, they are reserved to delineate the different members for the ARM template concat() call

- Quote usage in this template must remain compatible with the ARM template concat() generation performed by pkg/engine/template_generator.go

timmy-wright

The test data (CSECommand and CustomData) aren't required anymore. Please remove.

timmy-wright · 2026-04-08T23:47:47Z

pkg/agent/testdata/AKSWindows2025Gen2+NextGenNetworking/CSECommand

We removed all this test data from the repo a few weeks ago - you shouldn't need to create it anymore. Make sure you've merged the latest main branch and you should be able to delete the CSECommand and CustomData files.

github-actions · 2026-04-09T16:53:43Z

Changes cached containers or packages on windows VHDs

Please get a Windows SIG member to approve.

The following dif file shows any additions or deletions from what will be cached on windows VHDs organised by VHD type.

Additions are new things cached.
Deletions are things no longer cached.

diff --git a/vhd_files/2025-gen2.txt b/vhd_files/2025-gen2.txt
index d31b59b..a1b2b36 100644
--- a/vhd_files/2025-gen2.txt
+++ b/vhd_files/2025-gen2.txt
@@ -14,0 +15 @@ c:\akse-cache\csi-proxy\: https://packages.aks.azure.com/csi-proxy/v1.1.2-hotfix
+c:\akse-cache\wcn\: mcr.microsoft.com/wcn/package:1.6.0-cpu-arch
diff --git a/vhd_files/2025.txt b/vhd_files/2025.txt
index 03661ca..7e331bb 100644
--- a/vhd_files/2025.txt
+++ b/vhd_files/2025.txt
@@ -14,0 +15 @@ c:\akse-cache\csi-proxy\: https://packages.aks.azure.com/csi-proxy/v1.1.2-hotfix
+c:\akse-cache\wcn\: mcr.microsoft.com/wcn/package:1.6.0-cpu-arch

Copilot AI review requested due to automatic review settings February 3, 2026 17:41

rzlink requested review from AbelHu, Devinwong, YaoC, awesomenix, cameronmeissner, djsly, ganeshkumarashok, juan-lee, junjiezhang1997, lilypan26, mxj220, pdamianov-dev, phealy, r2k1, timmy-wright, yewmsft and zachary-bailey as code owners February 3, 2026 17:41

rzlink temporarily deployed to test February 3, 2026 17:41 — with GitHub Actions Inactive

github-actions bot added the components This pull request updates cached components on Linux or Windows VHDs label Feb 3, 2026

Copilot started reviewing on behalf of rzlink February 3, 2026 17:42 View session

Copilot AI reviewed Feb 3, 2026

View reviewed changes

rzlink changed the title ~~feat: Add Windows 2025 support for Windows Cilium Networking (WCN)~~ feat: add new feature Windows 2025 support for Windows Cilium Networking (WCN) Feb 3, 2026

rzlink changed the title ~~feat: add new feature Windows 2025 support for Windows Cilium Networking (WCN)~~ feat(windows): add Windows 2025 support for Windows Cilium Networking (WCN) Feb 3, 2026

timmy-wright approved these changes Feb 3, 2026

View reviewed changes

rzlink force-pushed the davwei/win2025cilium branch from cc832dc to 24e9890 Compare February 9, 2026 22:43

rzlink temporarily deployed to test February 9, 2026 22:43 — with GitHub Actions Inactive

Copilot AI review requested due to automatic review settings February 10, 2026 19:03

rzlink force-pushed the davwei/win2025cilium branch from 24e9890 to 86be468 Compare February 10, 2026 19:03

rzlink temporarily deployed to test February 10, 2026 19:04 — with GitHub Actions Inactive

rzlink force-pushed the davwei/win2025cilium branch from 6a51a79 to 1afca30 Compare April 2, 2026 22:25

rzlink requested review from SriHarsha001, calvin197, sulixu and surajssd as code owners April 2, 2026 22:25

rzlink temporarily deployed to test April 2, 2026 22:25 — with GitHub Actions Inactive

Copilot AI review requested due to automatic review settings April 7, 2026 21:13

zylxjtu temporarily deployed to test April 7, 2026 21:13 — with GitHub Actions Inactive

Copilot started reviewing on behalf of zylxjtu April 7, 2026 21:17 View session

Copilot AI reviewed Apr 7, 2026

View reviewed changes

zylxjtu force-pushed the davwei/win2025cilium branch from d90465d to 5c500e9 Compare April 7, 2026 22:10

zylxjtu temporarily deployed to test April 7, 2026 22:10 — with GitHub Actions Inactive

Copilot AI review requested due to automatic review settings April 8, 2026 20:36

zylxjtu force-pushed the davwei/win2025cilium branch from 5c500e9 to 50c0eac Compare April 8, 2026 20:36

zylxjtu temporarily deployed to test April 8, 2026 20:36 — with GitHub Actions Inactive

zylxjtu force-pushed the davwei/win2025cilium branch from 50c0eac to cbc090f Compare April 8, 2026 20:39

zylxjtu temporarily deployed to test April 8, 2026 20:39 — with GitHub Actions Inactive

Copilot AI reviewed Apr 8, 2026

View reviewed changes

Copilot started reviewing on behalf of zylxjtu April 8, 2026 20:43 View session

timmy-wright requested changes Apr 8, 2026

View reviewed changes

Add windows 2025 cilium support

41f38aa

zylxjtu force-pushed the davwei/win2025cilium branch from cbc090f to 41f38aa Compare April 9, 2026 16:51

zylxjtu temporarily deployed to test April 9, 2026 16:51 — with GitHub Actions Inactive

msft-linliu approved these changes Apr 9, 2026

View reviewed changes

timmy-wright approved these changes Apr 9, 2026

View reviewed changes

zylxjtu enabled auto-merge (squash) April 9, 2026 20:46

timmy-wright disabled auto-merge April 9, 2026 21:33

timmy-wright merged commit 80851cf into main Apr 9, 2026
40 of 45 checks passed

timmy-wright deleted the davwei/win2025cilium branch April 9, 2026 21:33

		$turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
		Set-Content -Path $completionFilePath -Value "ExitCode: \|$global:ExitCode\|, Output: \|$($global:ErrorCodeNames[$global:ExitCode])\|, Error: \|$turncatedErrorMessage\|"

	# From 2025-06 The CSE packages is eleased on the VHD. RP can use fully qualified URL to download CSE scripts package when required out of VHD release cycle.
	# From 2025-06 The CSE packages is released on the VHD. RP can use fully qualified URL to download CSE scripts package when required out of VHD release cycle.

	- Single quotes are forbidden, they are reserved to delineate the different members for the ARM template concat() call
	- Quote usage in this template must remain compatible with the ARM template concat() generation performed by pkg/engine/template_generator.go

Conversation

rzlink commented Feb 3, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

timmy-wright left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

timmy-wright left a comment

Choose a reason for hiding this comment

Uh oh!

timmy-wright Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Apr 9, 2026

Changes cached containers or packages on windows VHDs

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants