diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1 index bff4be6facf..3f6207b9ed3 100644 --- a/parts/windows/kuberneteswindowssetup.ps1 +++ b/parts/windows/kuberneteswindowssetup.ps1 @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData index 6b8a42da7da..4cd6f425f08 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData index 020a93a321b..9b1035350b5 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData index ee41b014c8b..9ded1642cb1 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData index c7ccb2f60f5..2d8186afd3b 100644 --- a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData index ac8da5d7032..3227d6df94d 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData index dec5c512ed6..26867a6d142 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData index 1485dd7a131..a55e8826fde 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData index 921243575f9..e9276f39b3d 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData index ae34329abc1..c391c6baacb 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData index 8f10c80976d..c68583461ea 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData index 6a0ce2060a1..db59bec9667 100644 --- a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData index 95d46633aa5..8bc60a8131f 100644 --- a/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData index 4478994ca63..1d8ffd2f750 100644 --- a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData index cd0ffca8682..a701b314f12 100644 --- a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData @@ -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 diff --git a/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData index 4db28052bd6..6d315453031 100644 --- a/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData @@ -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 diff --git a/staging/cse/windows/README b/staging/cse/windows/README index c44485ed248..01cb76a3f18 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.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 @@ -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 diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 638db4ec1ef..5b39a16e4ec 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.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.