Skip to content

Commit 55311f6

Browse files
Copilotsmith1511
andcommitted
Update Windows 2025 version from "test2025" to "2025"
Co-authored-by: smith1511 <1001494+smith1511@users.noreply.github.com>
1 parent 45fbfa7 commit 55311f6

File tree

17 files changed

+23
-23
lines changed

17 files changed

+23
-23
lines changed

parts/windows/windowscsehelper.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ function Get-WindowsVersion {
379379
"17763" { return "1809" }
380380
"20348" { return "ltsc2022" }
381381
"25398" { return "23H2" }
382-
"26100" { return "test2025" }
382+
"26100" { return "2025" }
383383
Default {
384384
Set-ExitCode -ExitCode $global:WINDOWS_CSE_ERROR_NOT_FOUND_BUILD_NUMBER -ErrorMessage "Failed to find the windows build number: $buildNumber"
385385
}
@@ -413,7 +413,7 @@ function Install-Containerd-Based-On-Kubernetes-Version {
413413
$KubernetesVersion
414414
)
415415

416-
# Get the current Windows version, this is interim since we are progressively supporting containerd 2.0 for all Windows version. for now only test2025
416+
# Get the current Windows version, this is interim since we are progressively supporting containerd 2.0 for all Windows version. for now only 2025
417417
$windowsVersion = Get-WindowsVersion
418418
Write-Log "Install Containerd with ContainerdURL: $ContainerdUrl, KubernetesVersion: $KubernetesVersion, WindowsVersion: $windowsVersion"
419419
Logs-To-Event -TaskName "AKS.WindowsCSE.InstallContainerdBasedOnKubernetesVersion" -TaskMessage "Start to install ContainerD based on kubernetes version. ContainerdUrl: $global:ContainerdUrl, KubernetesVersion: $global:KubeBinariesVersion, Windows Version: $windowsVersion"
@@ -428,7 +428,7 @@ function Install-Containerd-Based-On-Kubernetes-Version {
428428
if ($ContainerdUrl.EndsWith("/")) {
429429
$containerdPackage=$global:StableContainerdPackage
430430
# Check if we have Windows Server 2025 (not official yet and hence the SKU, as opposed to official name like 23H2 ) and Kubernetes version >= 1.33.0
431-
if ($windowsVersion -eq "test2025" -and ([version]$KubernetesVersion).CompareTo([version]$global:MinimalKubernetesVersionWithLatestContainerd2) -ge 0) {
431+
if ($windowsVersion -eq "2025" -and ([version]$KubernetesVersion).CompareTo([version]$global:MinimalKubernetesVersionWithLatestContainerd2) -ge 0) {
432432
$containerdPackage = $global:LatestContainerd2Package
433433
} elseif (([version]$KubernetesVersion).CompareTo([version]$global:MinimalKubernetesVersionWithLatestContainerd) -ge 0) {
434434
$containerdPackage=$global:LatestContainerdPackage

parts/windows/windowscsehelper.tests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Describe 'Install-Containerd-Based-On-Kubernetes-Version' {
3838
}
3939

4040
Context 'Windows Server 2022 (ltsc2022)' {
41-
# for windows versions other than test2025, containerd version is not changed and should not include containerd2
41+
# for windows versions other than 2025, containerd version is not changed and should not include containerd2
4242
BeforeAll {
4343
Mock Get-WindowsVersion -MockWith { return "ltsc2022" }
4444
}
@@ -74,10 +74,10 @@ Describe 'Install-Containerd-Based-On-Kubernetes-Version' {
7474
}
7575
}
7676

77-
Context 'Windows Server 2025 (test2025)' {
78-
# for windows versions other than test2025, containerd version is not changed and should not include containerd2
77+
Context 'Windows Server 2025 (2025)' {
78+
# for windows versions other than 2025, containerd version is not changed and should not include containerd2
7979
BeforeAll {
80-
Mock Get-WindowsVersion -MockWith { return "test2025" }
80+
Mock Get-WindowsVersion -MockWith { return "2025" }
8181
}
8282

8383
It 'k8s version is less to MinimalKubernetesVersionWithLatestContainerd2' {
@@ -159,7 +159,7 @@ Describe 'Get-WindowsVersion and Get-WindowsPauseVersion' {
159159
It 'build number is from Windows 2025' {
160160
Mock Get-WindowsBuildNumber -MockWith { return "26100" }
161161
$windowsVersion = Get-WindowsVersion
162-
$expectedVersion = "test2025"
162+
$expectedVersion = "2025"
163163
$windowsVersion | Should -Be $expectedVersion
164164
}
165165

pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+K8S116/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+K8S117/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+K8S118/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)