Merge branch 'master' into chore/cache-new-cni-images

Azure · May 31, 2024 · b7cdb15 · b7cdb15
2 parents 9895571 + 6d04acf
commit b7cdb15
Show file tree

Hide file tree

Showing 111 changed files with 44,165 additions and 3,401 deletions.
diff --git a/.pipelines/templates/.builder-release-template.yaml b/.pipelines/templates/.builder-release-template.yaml
@@ -196,6 +196,7 @@ steps:
         -e LOCATION="${AZURE_LOCATION}" \
         -e OS_TYPE="Linux" \
         -e CLASSIC_BLOB=${CLASSIC_BLOB} \
+        -e POOL_IDENTITY_RESOURCE_ID=$(POOL_IDENTITY_RESOURCE_ID) \
         -e SIG_GALLERY_NAME=${SIG_GALLERY_NAME} \
         -e SIG_IMAGE_NAME=${SIG_IMAGE_NAME} \
         -e CAPTURED_SIG_VERSION=${captured_sig_version} \

diff --git a/pkg/agent/datamodel/linux_sig_version.json b/pkg/agent/datamodel/linux_sig_version.json
@@ -1,4 +1,4 @@
 {
     "ostype": "LinuxSIGImageVersion",
-    "version": "202405.20.0"
+    "version": "202405.27.0"
 }
diff --git a/vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh b/vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 required_env_vars=(
+    "POOL_IDENTITY_RESOURCE_ID"
     "SUBSCRIPTION_ID"
     "RESOURCE_GROUP_NAME"
     "CAPTURED_SIG_VERSION"
@@ -67,8 +68,9 @@ echo "Converted $sig_resource_id to $disk_resource_id"
 # shellcheck disable=SC2102
 sas=$(az disk grant-access --ids $disk_resource_id --duration-in-seconds 3600 --query [accessSas] -o tsv)
 
-echo "Logging into azcopy with MSI"
-azcopy-preview login --identity
+echo "Using azcopy with pool identity: $POOL_IDENTITY_RESOURCE_ID"
+export AZCOPY_AUTO_LOGIN_TYPE="MSI"
+export AZCOPY_MSI_RESOURCE_STRING="$POOL_IDENTITY_RESOURCE_ID"
 
 echo "Uploading $disk_resource_id to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
 azcopy-preview copy "${sas}" "${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true || exit $?