Skip to content

Commit

Permalink
feat: bump Windows CSE script package to v0.0.37 (#3940)
Browse files Browse the repository at this point in the history
  • Loading branch information
@AbelHu
AbelHu authored Dec 27, 2023
1 parent a509f13 commit 5c40a5b
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 29 deletions.
2 changes: 1 addition & 1 deletion parts/windows/kuberneteswindowssetup.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.36.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.37.zip"
Write-Log "CSEScriptsPackageUrl is $global:CSEScriptsPackageUrl"
Write-Log "WindowsCSEScriptsPackage is $WindowsCSEScriptsPackage"
# Old AKS RP sets the full URL (https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.11.zip) in CSEScriptsPackageUrl
Expand Down
2 changes: 1 addition & 1 deletion pkg/templates/templates_generated.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 17 additions & 12 deletions staging/cse/windows/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
1. Run below commands to build a test package
```bash
branchName="master"
currentCseVersion="v0.0.35" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1`
testCseVersion="v0.0.35.0" # Test package name. NOTE: Please do not use the official package format and earlier used version.
currentCseVersion="v0.0.37" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1`
testCseVersion="v0.0.37.0" # Test package name. NOTE: Please do not use the official package format and earlier used version.
url="https://raw.githubusercontent.com/Azure/AgentBaker/$branchName/staging/cse/windows"

mkdir -p temp-work-folder/aks-windows-cse
Expand Down Expand Up @@ -55,29 +55,34 @@ popd
# AKS Windows CSE Scripts Package
All files except *.test.ps1 and README will be published in AKS Windows CSE Scripts Package.

## v0.0.37
- chore: add the output of collect-windows-logs-output into the node log #3919
- fix: check the path of nvidiaInstallLogFolder #3920
- feat: collect kubectl information in AKS Windows node log #3936

## v0.0.36
chore: support to test Windows 2025 #3871
- chore: support to test Windows 2025 #3871

## v0.0.35
feat: update cse script package changes for aks windows gpu feature #3794
feat: optimize resize-osdrive replacing get-partitionsupportedsize with diskpart #3804
- feat: update cse script package changes for aks windows gpu feature #3794
- feat: optimize resize-osdrive replacing get-partitionsupportedsize with diskpart #3804

## v0.0.34
feat: adding changes to AgentBaker for Stateless CNI on Windows #3704
chore: update the MaxRetryCount to 60 in Check-APIServerConnectivity of Windows CSE #3737
- feat: adding changes to AgentBaker for Stateless CNI on Windows #3704
- chore: update the MaxRetryCount to 60 in Check-APIServerConnectivity of Windows CSE #3737

## v0.0.33
update signature of binaries in windows cse script package
- update signature of binaries in windows cse script package

## v0.0.32
chore: update regkey for disabling OutboundNAT on WS2022 nodes #3655
- chore: update regkey for disabling OutboundNAT on WS2022 nodes #3655

## v0.0.31
fix: WS2022 support disabling OutboundNAT without updating regkey in CSE #3621
chore: use Get-WindowsVersion for os version check #3630
- fix: WS2022 support disabling OutboundNAT without updating regkey in CSE #3621
- chore: use Get-WindowsVersion for os version check #3630

## v0.0.30
chore: added check on Windows CSE for vmss type so we don't throw an error #3520
- chore: added check on Windows CSE for vmss type so we don't throw an error #3520

## v0.0.29
- chore: remove unused function #3415
Expand Down
5 changes: 2 additions & 3 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ $global:map = @{
"c:\akse-cache\" = @(
"https://acs-mirror.azureedge.net/ccgakvplugin/v1.1.5/binaries/windows-gmsa-ccgakvplugin-v1.1.5.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.33.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.34.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.35.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.36.zip"
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.36.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.37.zip"
);
# Different from other packages which are downloaded/cached and used later only during CSE, windows containerd is installed
# during building the Windows VHD to cache container images.
Expand Down

0 comments on commit 5c40a5b

Please sign in to comment.