From 0483cd5ef7861a20bd260124341a03fcc2645ada Mon Sep 17 00:00:00 2001 From: Junjie Zhang <109257558+junjiezhang1997@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:07:38 +0800 Subject: [PATCH 1/3] fix: use latest cli to get default k8s version (#4000) --- .pipelines/e2e-windows.yaml | 5 ++++- .pipelines/templates/e2e-windows-template.yaml | 10 ++++------ e2e/windows/e2e-helper.sh | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.pipelines/e2e-windows.yaml b/.pipelines/e2e-windows.yaml index 2479b602ac7..0f489eede6a 100644 --- a/.pipelines/e2e-windows.yaml +++ b/.pipelines/e2e-windows.yaml @@ -8,10 +8,13 @@ pr: - 'official/*' paths: include: - - '.pipelines/*' + - .pipelines/e2e-windows.yaml + - .pipelines/templates/e2e-windows-template.yaml - 'e2e/windows/*' - 'parts/windows/*' - 'staging/cse/windows/*' + exclude: + - 'vhdbuilder/*' # Use variable group "ab-windows-ms-tenant" and link it to the pipeline "Agentbaker Windows E2E" diff --git a/.pipelines/templates/e2e-windows-template.yaml b/.pipelines/templates/e2e-windows-template.yaml index 5e7b9545fa0..c832c93b98f 100644 --- a/.pipelines/templates/e2e-windows-template.yaml +++ b/.pipelines/templates/e2e-windows-template.yaml @@ -21,8 +21,6 @@ parameters: jobs: - job: Setup_Test_Cluster steps: - - bash: pip install -Iv azure-cli==2.45.0 --extra-index-url https://azurecliprod.blob.core.windows.net/edge - displayName: use specified version of az cli - bash: | az login --identity az account set -s $(AZURE_E2E_SUBSCRIPTION_ID) @@ -47,7 +45,8 @@ jobs: fi else if [[ -z "${KUBERNETES_VERSION}" ]]; then - KUBERNETES_VERSION=$(az aks get-versions -l $AZURE_BUILD_LOCATION --query "orchestrators[?default==\`true\`].orchestratorVersion" -otsv) + defaultMajorVersion=$(az aks get-versions -l $AZURE_BUILD_LOCATION --query "values[?isDefault==\`true\`].version" -otsv) + KUBERNETES_VERSION=$(az aks get-versions -l $AZURE_BUILD_LOCATION -o table | awk '{print $1}' | awk "/$defaultMajorVersion/ {print}" | sort -r | awk 'NR==1') echo "Using default kubernetes version ${KUBERNETES_VERSION} for the windows package" fi export windowsPackageURL="https://acs-mirror.azureedge.net/kubernetes/v${KUBERNETES_VERSION}/windowszip/v${KUBERNETES_VERSION}-1int.zip" @@ -85,8 +84,6 @@ jobs: steps: - download: current artifact: ${{ parameters.windowsImage }}${{ parameters.windowsGpuDriverSuffix }}-clusterConfig - - bash: pip install -Iv azure-cli==2.45.0 --extra-index-url https://azurecliprod.blob.core.windows.net/edge - displayName: use specified version of az cli - bash: | az login --identity az account set -s $(AZURE_E2E_SUBSCRIPTION_ID) @@ -111,7 +108,8 @@ jobs: export WINDOWS_PACKAGE_VERSION=$(echo $windowsPackageURL | grep -oP '(?<=/v)\d+\.\d+\.\d+' | head -1) else if [[ -z "${KUBERNETES_VERSION}" ]]; then - KUBERNETES_VERSION=$(az aks get-versions -l $AZURE_BUILD_LOCATION --query "orchestrators[?default==\`true\`].orchestratorVersion" -otsv) + defaultMajorVersion=$(az aks get-versions -l $AZURE_BUILD_LOCATION --query "values[?isDefault==\`true\`].version" -otsv) + KUBERNETES_VERSION=$(az aks get-versions -l $AZURE_BUILD_LOCATION -o table | awk '{print $1}' | awk "/$defaultMajorVersion/ {print}" | sort -r | awk 'NR==1') echo "Using default kubernetes version ${KUBERNETES_VERSION} for the windows package" fi export windowsPackageURL="https://acs-mirror.azureedge.net/kubernetes/v${KUBERNETES_VERSION}/windowszip/v${KUBERNETES_VERSION}-1int.zip" diff --git a/e2e/windows/e2e-helper.sh b/e2e/windows/e2e-helper.sh index 52e558cdea2..cf94da2a399 100755 --- a/e2e/windows/e2e-helper.sh +++ b/e2e/windows/e2e-helper.sh @@ -19,7 +19,7 @@ exec_on_host() { backfill_clean_storage_container() { set +x # Get supported kubernetes versions - versions=$(az aks get-versions --location $AZURE_BUILD_LOCATION --query "orchestrators[].orchestratorVersion" -o tsv) + versions=$(az aks get-versions --location $AZURE_BUILD_LOCATION -o table | tail -n +3 | awk '{print $1}') k8s_versions=${versions//./} # Get container names e.g. akswinstore2022-1256 (for this $container_version would be "1256") From a05c6970acb17e308d658ffd5239d01b7e0c9edb Mon Sep 17 00:00:00 2001 From: Chou Hu Date: Fri, 26 Jan 2024 13:20:51 +0800 Subject: [PATCH 2/3] build: add Windows VHD build auto trigger rules (#3999) --- .../.vsts-vhd-builder-release-windows.yaml | 20 +++++++++++++++++++ packer.mk | 3 --- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.pipelines/.vsts-vhd-builder-release-windows.yaml b/.pipelines/.vsts-vhd-builder-release-windows.yaml index 735c537d42f..f06b304419d 100644 --- a/.pipelines/.vsts-vhd-builder-release-windows.yaml +++ b/.pipelines/.vsts-vhd-builder-release-windows.yaml @@ -1,5 +1,25 @@ name: $(Date:yyyyMMdd)$(Rev:.r)_$(Build.SourceBranchName)_$(BuildID) trigger: none +pr: + branches: + include: + - master + paths: + include: + - .pipelines/.vsts-vhd-builder-release-windows.yaml + - .pipelines/templates/.builder-release-template-windows.yaml + - packer.mk + - vhdbuilder/packer/packer-plugin.pkr.hcl + - vhdbuilder/packer/*.ps1 + - vhdbuilder/packer/test/*.ps1 + - vhdbuilder/packer/test/run-test.sh + - vhdbuilder/packer/backfill-cleanup.sh + - vhdbuilder/packer/cleanup.sh + - vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh + - vhdbuilder/packer/generate-vhd-publishing-info.sh + - vhdbuilder/packer/init-variables.sh + - vhdbuilder/packer/windows-image.env + - vhdbuilder/packer/windows-vhd-builder-sig.json pool: name: $(AZURE_POOL_NAME) diff --git a/packer.mk b/packer.mk index 4dac49b45a2..ea98c4a6c19 100755 --- a/packer.mk +++ b/packer.mk @@ -95,8 +95,5 @@ generate-sas: az-login convert-sig-to-classic-storage-account-blob: az-login @./vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh -windows-vhd-publishing-info: az-login - @./vhdbuilder/packer/generate-windows-vhd-publishing-info.sh - test-building-vhd: az-login @./vhdbuilder/packer/test/run-test.sh From 89516f2dce5ada31e9cbbe1856f1662b114dd397 Mon Sep 17 00:00:00 2001 From: Junjie Zhang <109257558+junjiezhang1997@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:40:41 +0800 Subject: [PATCH 3/3] chore: clean up unused Get-KubeBinaries and unused rule in windows e2e yaml (#4004) --- .pipelines/e2e-windows.yaml | 5 +---- parts/windows/kuberneteswindowssetup.ps1 | 11 +---------- .../testdata/AKSWindows2019+CustomCloud/CustomData | 11 +---------- .../testdata/AKSWindows2019+CustomVnet/CustomData | 11 +---------- .../CustomData | 11 +---------- pkg/agent/testdata/AKSWindows2019+K8S116/CustomData | 11 +---------- pkg/agent/testdata/AKSWindows2019+K8S117/CustomData | 11 +---------- pkg/agent/testdata/AKSWindows2019+K8S118/CustomData | 11 +---------- .../testdata/AKSWindows2019+K8S119+CSI/CustomData | 11 +---------- .../testdata/AKSWindows2019+K8S119+FIPS/CustomData | 11 +---------- pkg/agent/testdata/AKSWindows2019+K8S119/CustomData | 11 +---------- .../CustomData | 11 +---------- .../AKSWindows2019+ManagedIdentity/CustomData | 11 +---------- .../AKSWindows2019+SecurityProfile/CustomData | 11 +---------- pkg/templates/templates_generated.go | 11 +---------- 15 files changed, 15 insertions(+), 144 deletions(-) diff --git a/.pipelines/e2e-windows.yaml b/.pipelines/e2e-windows.yaml index 0f489eede6a..1e0b613b4f3 100644 --- a/.pipelines/e2e-windows.yaml +++ b/.pipelines/e2e-windows.yaml @@ -1,10 +1,9 @@ name: $(Date:yyyyMMdd)$(Rev:.r)_e2e trigger: none - pr: branches: include: - - main + - master - 'official/*' paths: include: @@ -13,8 +12,6 @@ pr: - 'e2e/windows/*' - 'parts/windows/*' - 'staging/cse/windows/*' - exclude: - - 'vhdbuilder/*' # Use variable group "ab-windows-ms-tenant" and link it to the pipeline "Agentbaker Windows E2E" diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1 index fae93f55810..08195a54360 100644 --- a/parts/windows/kuberneteswindowssetup.ps1 +++ b/parts/windows/kuberneteswindowssetup.ps1 @@ -293,15 +293,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -468,7 +459,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData index 2f53d79fcc2..92ca5fd4dc1 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -464,7 +455,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData index 75cd2697e63..660d1dacc20 100644 --- a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData index 9cd80ad3f8e..b3b6bf9c8a5 100644 --- a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData index d84fe402764..5e4d8a7e2c1 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData index a745aba33e2..69af49cc8fa 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData index 97635b85fb4..fec356c2a7d 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData index c6e9e7ecc04..e7862c17d82 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData index 42195615316..84305166f42 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData index aca8a21177c..975e1d89169 100644 --- a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData index 43004408dc7..b0aeeb035e6 100644 --- a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData index 7bf186f2b26..e1878a8fbaa 100644 --- a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData index 34042944d54..d16c3669a4e 100644 --- a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData @@ -289,15 +289,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -458,7 +449,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force } diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 5827de3a052..150514c4fa1 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -7618,15 +7618,6 @@ try Write-Log "Download kubelet binaries and unzip" Get-KubePackage -KubeBinariesSASURL $global:KubeBinariesPackageSASURL - # This overwrites the binaries that are downloaded from the custom packge with binaries. - # The custom package has a few files that are necessary for future steps (nssm.exe) - # this is a temporary work around to get the binaries until we depreciate - # custom package and nssm.exe as defined in aks-engine#3851. - if ($global:WindowsKubeBinariesURL){ - Write-Log "Overwriting kube node binaries from $global:WindowsKubeBinariesURL" - Get-KubeBinaries -KubeBinariesURL $global:WindowsKubeBinariesURL - } - Write-Log "Installing ContainerD" $cniBinPath = $global:AzureCNIBinDir $cniConfigPath = $global:AzureCNIConfDir @@ -7793,7 +7784,7 @@ try if (Test-Path $CacheDir) { - Write-Log "Removing aks-engine bits cache directory" + Write-Log "Removing aks cache directory" Remove-Item $CacheDir -Recurse -Force }