From 81c8e2272acfd498d4b7f5a180d57aeeaaca0946 Mon Sep 17 00:00:00 2001 From: Abel Hu Date: Fri, 30 Aug 2024 07:16:54 +0000 Subject: [PATCH] feat: bump AKS Windows CSE script package to v0.0.47 --- parts/windows/kuberneteswindowssetup.ps1 | 2 +- .../CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData | 2 +- .../CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S116/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S119/CustomData | 2 +- .../CustomData | 2 +- .../CustomData | 2 +- .../testdata/AKSWindows2019+ManagedIdentity/CustomData | 2 +- .../testdata/AKSWindows2019+SecurityProfile/CustomData | 2 +- .../AKSWindows2019+ootcredentialprovider/CustomData | 2 +- staging/cse/windows/README | 9 +++++++-- vhdbuilder/packer/generate-windows-vhd-configuration.ps1 | 3 ++- 18 files changed, 25 insertions(+), 19 deletions(-) diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1 index 9dfc54180ed..6885016b4f2 100644 --- a/parts/windows/kuberneteswindowssetup.ps1 +++ b/parts/windows/kuberneteswindowssetup.ps1 @@ -237,7 +237,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData index 9a21d6d3134..e6523a8fe13 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData index a905d197e64..49852be69db 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData index 92169f31692..b354f33312e 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData index c0f0799808a..72930534ed5 100644 --- a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData index 5a52dde9323..8f56420d4ba 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData index 91f816a3a19..f017d8fba3d 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData index 569c5c721f9..ab37d945c12 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData index 0390657d512..c1eb1b6d8ac 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData index 18a9676a370..662e29a693a 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData index 98e8b288e04..080c5ebda2b 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData index b98aefdd8be..02f7c2ef3e2 100644 --- a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData index 95a4d5f14e6..3caef1067de 100644 --- a/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData index 181772135a0..8f7822b83d0 100644 --- a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData index 031d321ed30..03adb145110 100644 --- a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData @@ -233,7 +233,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.47.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 diff --git a/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData index f7d923e36d4..912f6518269 100644 --- a/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData @@ -233,7 +233,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.47.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 diff --git a/staging/cse/windows/README b/staging/cse/windows/README index c44485ed248..4d80028a9c4 100644 --- a/staging/cse/windows/README +++ b/staging/cse/windows/README @@ -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.47" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1` +testCseVersion="v0.0.47.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 @@ -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.47 +- chore: refine collect-windows-logs.ps1 to enable crt by default #4863 +- chore: add windowsnodereset.log in loggenerator.ps1 #4869 +- fix: exclude udp ports on Windows #4886 + ## v0.0.46 - feat: add log events in Windows CSE #4657 - feat: block 32526 to wireserver on Windows nodes #4758 diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 993c07bf17d..b1ae5c92b27 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -139,7 +139,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.47.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.