Azure
/
AgentBaker
зеркало из https://github.com/Azure/AgentBaker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

feat: bump Windows CSE script package version to v0.0.44 (#4550)

This commit is contained in:
Chou Hu 2024-06-25 16:47:03 +08:00 коммит произвёл GitHub
Родитель fbc8a7f17b
Коммит acf4d16e08
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
17 изменённых файлов: 22 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

7
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

3
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.