Skip to content

Commit

Permalink
feat: bump AKS Windows CSE script package to v0.0.48 (#4940)
Browse files Browse the repository at this point in the history
  • Loading branch information
@AbelHu
AbelHu authored Sep 13, 2024
1 parent 2a17809 commit 3425fe5
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 19 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 @@ -239,7 +239,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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+ootcredentialprovider/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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+KubeletServingCertificateRotation/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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 @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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+ootcredentialprovider/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ try
Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'"
# TODO update to use proxy

$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.46.zip"
$WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.48.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
9 changes: 7 additions & 2 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.46" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1`
testCseVersion="v0.0.46.0" # Test package name. NOTE: Please do not use the official package format and earlier used version.
currentCseVersion="v0.0.48" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1`
testCseVersion="v0.0.48.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 @@ -58,6 +58,11 @@ popd
# AKS Windows CSE Scripts Package
All files except *.test.ps1 and README will be published in AKS Windows CSE Scripts Package.

## v0.0.48
- chore: refine collect-windows-logs.ps1 to enable crt by default #4863
- chore: add windowsnodereset.log in loggenerator.ps1 #4869
- feat: respect nodepool tags for disabling kubelet serving certificate rotation #4911

## v0.0.46
- feat: add log events in Windows CSE #4657
- feat: block 32526 to wireserver on Windows nodes #4758
Expand Down
3 changes: 2 additions & 1 deletion vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,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.45.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.46.zip"
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.46.zip",
"https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.48.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 3425fe5

Please sign in to comment.