diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index 4562eebc75f..e821928684c 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -353,20 +353,7 @@ "downloadLocation": "/opt/cni/downloads", "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries", "versions": [ - "1.4.52", "1.4.54", - "1.5.23", - "1.5.28" - ] - }, - { - "fileName": "azure-vnet-cni-swift-linux-amd64-v*", - "downloadLocation": "/opt/cni/downloads", - "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries", - "versions": [ - "1.4.52", - "1.4.54", - "1.5.23", "1.5.28" ] }, diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh index 29a8fd9c705..8b8c5a9eda4 100644 --- a/vhdbuilder/packer/install-dependencies.sh +++ b/vhdbuilder/packer/install-dependencies.sh @@ -356,9 +356,7 @@ unpackAzureCNI() { #must be both amd64/arm64 images VNET_CNI_VERSIONS=" -1.4.52 1.4.54 -1.5.23 1.5.28 " @@ -370,22 +368,6 @@ for VNET_CNI_VERSION in $VNET_CNI_VERSIONS; do echo " - Azure CNI version ${VNET_CNI_VERSION}" >> ${VHD_LOGS_FILEPATH} done -#UNITE swift and overlay versions? -#Please add new version (>=1.4.13) in this section in order that it can be pulled by both AMD64/ARM64 vhd -SWIFT_CNI_VERSIONS=" -1.4.52 -1.4.54 -1.5.23 -1.5.28 -" - -for SWIFT_CNI_VERSION in $SWIFT_CNI_VERSIONS; do - VNET_CNI_PLUGINS_URL="https://acs-mirror.azureedge.net/azure-cni/v${SWIFT_CNI_VERSION}/binaries/azure-vnet-cni-swift-linux-${CPU_ARCH}-v${SWIFT_CNI_VERSION}.tgz" - downloadAzureCNI - unpackAzureCNI $VNET_CNI_PLUGINS_URL - echo " - Azure Swift CNI version ${SWIFT_CNI_VERSION}" >> ${VHD_LOGS_FILEPATH} -done - # After v0.7.6, URI was changed to renamed to https://acs-mirror.azureedge.net/cni-plugins/v*/binaries/cni-plugins-linux-arm64-v*.tgz MULTI_ARCH_CNI_PLUGIN_VERSIONS=" 1.4.1 diff --git a/vhdbuilder/packer/test/windows-files-check.ps1 b/vhdbuilder/packer/test/windows-files-check.ps1 index 2304af0f12d..48c45e2ab87 100644 --- a/vhdbuilder/packer/test/windows-files-check.ps1 +++ b/vhdbuilder/packer/test/windows-files-check.ps1 @@ -324,4 +324,4 @@ function Test-PullImages { Test-CompareFiles Test-ValidateAllSignature -Test-PullImages \ No newline at end of file +Test-PullImages