From 1530acd46d7c8c2bef92b516584e47906d388a1b Mon Sep 17 00:00:00 2001 From: Chou Hu Date: Wed, 12 Jun 2024 13:22:31 +0800 Subject: [PATCH] feat: bump Windows CSE script package version to v0.0.43 (#4497) --- parts/windows/kuberneteswindowssetup.ps1 | 2 +- .../CustomData | 2 +- .../testdata/AKSWindows2019+CustomCloud/CustomData | 2 +- .../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 +- .../testdata/AKSWindows2019+K8S119+CSI/CustomData | 2 +- .../testdata/AKSWindows2019+K8S119+FIPS/CustomData | 2 +- pkg/agent/testdata/AKSWindows2019+K8S119/CustomData | 2 +- .../CustomData | 2 +- .../testdata/AKSWindows2019+ManagedIdentity/CustomData | 2 +- .../testdata/AKSWindows2019+SecurityProfile/CustomData | 2 +- .../AKSWindows2019+ootcredentialprovider/CustomData | 2 +- staging/cse/windows/README | 10 ++++++++-- .../packer/generate-windows-vhd-configuration.ps1 | 5 ++--- vhdbuilder/packer/test/windows-files-check.ps1 | 3 ++- vhdbuilder/packer/test/windows-vhd-content-test.ps1 | 1 + 19 files changed, 28 insertions(+), 21 deletions(-) diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1 index 81d26482bc2..522b5a9a690 100644 --- a/parts/windows/kuberneteswindowssetup.ps1 +++ b/parts/windows/kuberneteswindowssetup.ps1 @@ -241,7 +241,7 @@ try Write-Log "private egress proxy address is '$global:PrivateEgressProxyAddress'" # TODO update to use proxy - $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 ff39dd18e82..c75d82f46b7 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 cd965a6cabb..b05c8322dbb 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 950d2ee1379..93d2f5d1bee 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 3560b0b573a..05f57258554 100644 --- a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 a55c86d658e..fbe59676a69 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 444d2071b35..c740ccc45c5 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 4cb218bbab3..fc340ee8555 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 138d0736f6c..a1779c4c3ff 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 27eb8562f27..b20299fc4d4 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 52a160df47c..666eeba7536 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 7a8fdb1bb1d..b57063a709e 100644 --- a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 d90208486f5..436a7e67abf 100644 --- a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 8d6afb610c5..f6cd1cfff25 100644 --- a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 2c18e0bf428..86df986415b 100644 --- a/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData @@ -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.42.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.43.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 4b4d1062ebf..b7cf4d2f37d 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.42" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1` -testCseVersion="v0.0.42.0" # Test package name. NOTE: Please do not use the official package format and earlier used version. +currentCseVersion="v0.0.43" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1` +testCseVersion="v0.0.43.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,12 @@ popd # AKS Windows CSE Scripts Package All files except *.test.ps1 and README will be published in AKS Windows CSE Scripts Package. +## v0.0.43 +- feat: support Windows private k8s packages #4496 +- doc: update Windows CSE script package doc #4447 +- feat: cse supports windows-exporter log #4389 +- feat: refine collect-windows-logs.ps1 #4383 + ## v0.0.42 - feat: add parameters for collect-windows-logs.ps1 #4325 - feat: support skipping legacy code CleanupNetwork in AKS Windows CSE #4131 diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index c42498f238a..cc2ba155736 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -115,9 +115,8 @@ $global:imagesToPull += @( $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.40.zip", - "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.41.zip", - "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.42.zip" + "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.42.zip", + "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.43.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. diff --git a/vhdbuilder/packer/test/windows-files-check.ps1 b/vhdbuilder/packer/test/windows-files-check.ps1 index 48c45e2ab87..2d9e316c1d4 100644 --- a/vhdbuilder/packer/test/windows-files-check.ps1 +++ b/vhdbuilder/packer/test/windows-files-check.ps1 @@ -185,7 +185,8 @@ function Test-CompareSingleDir { "azure-vnet-cni-singletenancy-overlay-windows-amd64", # We need upstream's help to republish this package. Before that, it does not impact functionality and 1.26 is only in public preview # so we can ignore the different hash values. - "v1.26.0-1int.zip" + "v1.26.0-1int.zip", + "azure-acr-credential-provider-windows-amd64-v1.29.2.tar.gz" ) foreach ($URL in $map[$dir]) { diff --git a/vhdbuilder/packer/test/windows-vhd-content-test.ps1 b/vhdbuilder/packer/test/windows-vhd-content-test.ps1 index 066fc3a7571..358db682fb1 100644 --- a/vhdbuilder/packer/test/windows-vhd-content-test.ps1 +++ b/vhdbuilder/packer/test/windows-vhd-content-test.ps1 @@ -140,6 +140,7 @@ function Test-FilesToCacheOnVHD $localFileSize = (Get-Item $dest).length $remoteFileSize = (Invoke-WebRequest $mcURL -UseBasicParsing -Method Head).Headers.'Content-Length' if ($localFileSize -ne $remoteFileSize) { + # Please also update excludeHashComparisionListInAzureChinaCloud in vhdbuilder/packer/test/windows-files-check.ps1 $excludeHashComparisionListInAzureChinaCloud = @( "calico-windows", "azure-vnet-cni-singletenancy-windows-amd64",