diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1 index 522b5a9a69..a81194ea7c 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 c75d82f46b..3382eb935a 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 b05c8322db..f7b5f405e5 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 93d2f5d1be..e4b9d882b0 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 05f5725855..9b9aff9b85 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 fbe59676a6..2b3e1a75a9 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 c740ccc45c..7eb35cf39f 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 fc340ee855..236bff8e8e 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 a1779c4c3f..544b1c96b2 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 b20299fc4d..607be230eb 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 666eeba753..b0a98f164a 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 b57063a709..0024e712e1 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 436a7e67ab..4a695352b0 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 f6cd1cfff2..2406325209 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 86df986415..a3e8f6e775 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.43.zip" + $WindowsCSEScriptsPackage = "aks-windows-cse-scripts-v0.0.44.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 b7cf4d2f37..d5535b69b8 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.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. +currentCseVersion="v0.0.44" # `WindowsCSEScriptsPackage` defined in `parts/windows/kuberneteswindowssetup.ps1` +testCseVersion="v0.0.44.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,9 @@ popd # AKS Windows CSE Scripts Package All files except *.test.ps1 and README will be published in AKS Windows CSE Scripts Package. +## v0.0.44 +- fix: do not collect vfp ports in loggenerator.ps1 #4542 + ## v0.0.43 - feat: support Windows private k8s packages #4496 - doc: update Windows CSE script package doc #4447 diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index d918038fe4..4a81f742eb 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -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.42.zip", - "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.43.zip" + "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.43.zip", + "https://acs-mirror.azureedge.net/aks/windows/cse/aks-windows-cse-scripts-v0.0.44.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.