Skip to content

chore(vhdbuilder): add COSI conversion for ACL VHD images#8532

Closed
bfjelds wants to merge 2 commits into
mainfrom
user/bfjelds/acl-cosi-generation
Closed

chore(vhdbuilder): add COSI conversion for ACL VHD images#8532
bfjelds wants to merge 2 commits into
mainfrom
user/bfjelds/acl-cosi-generation

Conversation

@bfjelds
Copy link
Copy Markdown
Member

@bfjelds bfjelds commented May 18, 2026 •
edited
Loading

What this PR does / why we need it:

Add a post-build pipeline step that converts AzureContainerLinux (ACL) VHD images to COSI format using ImageCustomizer's convert command (v1.2.0-2). Export ACL COSI image, used for A/B updates.

Changes:

  • New script: convert-vhd-to-cosi.sh downloads ACL VHD from blob storage, runs ImageCustomizer convert (VHD -> COSI), and uploads the COSI file
  • New make target: convert-vhd-to-cosi in packer.mk
  • Pipeline vars: set IMG_CUSTOMIZER_CONTAINER and IMG_CUSTOMIZER_VERSION on ACL build jobs in both PR and release pipelines
  • Builder template: add Convert ACL VHD to COSI step after SIG->classic conversion, conditioned on OS_SKU=AzureContainerLinux
  • Immutable copy: updated to also copy/remove .cosi files for ACL builds

Which issue(s) this PR fixes:

Fixes #

@bfjelds
Add COSI conversion for ACL VHD images
4c5bb53 
Add a post-build pipeline step that converts AzureContainerLinux (ACL) VHD
images to COSI format using ImageCustomizer's convert command (v1.2.0-2).

Changes:
- New script: convert-vhd-to-cosi.sh downloads ACL VHD from blob storage,
  runs ImageCustomizer convert (VHD -> COSI), and uploads the COSI file
- New make target: convert-vhd-to-cosi in packer.mk
- Pipeline vars: set IMG_CUSTOMIZER_CONTAINER and IMG_CUSTOMIZER_VERSION
  on ACL build jobs in both PR and release pipelines
- Builder template: add Convert ACL VHD to COSI step after SIG->classic
  conversion, conditioned on OS_SKU=AzureContainerLinux
- Immutable copy: updated to also copy/remove .cosi files for ACL builds

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Brian Fjeldstad <bfjelds@microsoft.com>
Copilot AI review requested due to automatic review settings May 18, 2026 19:44
@bfjelds bfjelds changed the title chore(vhdbuilder): add COSI conversion for ACL VHD images [WIP] chore(vhdbuilder): add COSI conversion for ACL VHD images May 18, 2026
@bfjelds bfjelds changed the title [WIP] chore(vhdbuilder): add COSI conversion for ACL VHD images chore(vhdbuilder): add COSI conversion for ACL VHD images May 18, 2026
bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread .pipelines/templates/.builder-release-template.yaml Outdated
echo "Successfully copied VHD to immutable container"
if [ "${OS_SKU}" = "AzureContainerLinux" ]; then
echo "Copying ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.cosi to immutable storage container"
az storage blob copy start --account-name "$STORAGE_ACCOUNT_NAME" --destination-blob "${CAPTURED_SIG_VERSION}.cosi" --destination-container "$VHD_CONTAINER_NAME" --source-uri "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.cosi" --auth-mode login || exit 1
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

find correct place to upload

Copilot AI reviewed May 18, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds a post-build pipeline stage that converts AzureContainerLinux (ACL) VHD images to COSI format using the imagecustomizer convert tool, and propagates the new .cosi artifact through the immutable-blob copy step.

Changes:

  • New script convert-vhd-to-cosi.sh + convert-vhd-to-cosi make target that downloads the ACL VHD, runs imagecustomizer convert in a container, and uploads the resulting .cosi back to blob storage.
  • New pipeline step in .builder-release-template.yaml (conditioned on OS_SKU=AzureContainerLinux) and extension to the immutable-copy step that also copies/removes .cosi files.
  • ACL build jobs in both PR and release pipelines now set SIG_SOURCE_* and IMG_CUSTOMIZER_CONTAINER/IMG_CUSTOMIZER_VERSION (mcr.microsoft.com/azurelinux/imagecustomizer:1.2.0-2).

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file
File Description
vhdbuilder/packer/imagecustomizer/scripts/convert-vhd-to-cosi.sh New script: pulls ACL VHD, runs ImageCustomizer convert to COSI, uploads result.
packer.mk Adds convert-vhd-to-cosi make target wrapping the new script.
.pipelines/templates/.builder-release-template.yaml Adds ACL-only Convert-to-COSI step; extends immutable copy step to also copy/remove the .cosi blob.
.pipelines/.vsts-vhd-builder.yaml Sets ACL SIG source variables and ImageCustomizer container/version for amd64 + arm64 PR jobs.
.pipelines/.vsts-vhd-builder-release.yaml Same variable additions for the release pipeline.

@bfjelds
Upload COSI to PMC Storage via AFD endpoint instead of VHD staging co…
ee5c8d6 
…ntainer

Match adamsanaglo's proof-of-concept upload destination:
- Upload to AFD_UPLOAD_ENDPOINT/COSI_CONTAINER/{config}-{version}.cosi
- Use IMG_CUSTOMIZER_CONFIG for blob name prefix (cosi-acl)
- Remove COSI copy-to-immutable logic (no longer in staging container)
- Pass AFD_UPLOAD_ENDPOINT, COSI_CONTAINER, IMG_CUSTOMIZER_CONFIG env vars

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Brian Fjeldstad <bfjelds@microsoft.com>
bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread vhdbuilder/packer/imagecustomizer/scripts/convert-vhd-to-cosi.sh
exit $azExitCode
fi

echo "Successfully converted and uploaded COSI: ${AFD_UPLOAD_ENDPOINT}/${COSI_CONTAINER}/${COSI_BLOB_NAME}"
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to register with nebraska

bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread vhdbuilder/packer/imagecustomizer/scripts/convert-vhd-to-cosi.sh
@@ -0,0 +1,104 @@
#!/bin/bash
set -euo pipefail
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it sounds like this type of code needs to move to https://msazure.visualstudio.com/CloudNativeCompute/_git/aks-rp?path=/nodelifecycle/vhdbuilder&version=GBmaster&_a=contents

bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread .pipelines/.vsts-vhd-builder.yaml
echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add vars here?

bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread .pipelines/.vsts-vhd-builder.yaml
echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
displayName: Setup Build Variables
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add vars here?

bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread .pipelines/.vsts-vhd-builder-release.yaml
echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
displayName: Setup Build Variables
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set vars here?

bfjelds
bfjelds commented May 18, 2026
View reviewed changes
Comment thread .pipelines/.vsts-vhd-builder-release.yaml
echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
displayName: Setup Build Variables
Copy link
Copy Markdown
Member Author

@bfjelds bfjelds May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set vars here?

@bfjelds bfjelds closed this May 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@cameronmeissner cameronmeissner Awaiting requested review from cameronmeissner cameronmeissner will be requested when the pull request is marked ready for review cameronmeissner is a code owner

@ganeshkumarashok ganeshkumarashok Awaiting requested review from ganeshkumarashok ganeshkumarashok will be requested when the pull request is marked ready for review ganeshkumarashok is a code owner

@Devinwong Devinwong Awaiting requested review from Devinwong Devinwong will be requested when the pull request is marked ready for review Devinwong is a code owner

@lilypan26 lilypan26 Awaiting requested review from lilypan26 lilypan26 will be requested when the pull request is marked ready for review lilypan26 is a code owner

@AbelHu AbelHu Awaiting requested review from AbelHu AbelHu will be requested when the pull request is marked ready for review AbelHu is a code owner

@junjiezhang1997 junjiezhang1997 Awaiting requested review from junjiezhang1997 junjiezhang1997 will be requested when the pull request is marked ready for review junjiezhang1997 is a code owner

@djsly djsly Awaiting requested review from djsly djsly will be requested when the pull request is marked ready for review djsly is a code owner

@phealy phealy Awaiting requested review from phealy phealy will be requested when the pull request is marked ready for review phealy is a code owner

@r2k1 r2k1 Awaiting requested review from r2k1 r2k1 will be requested when the pull request is marked ready for review r2k1 is a code owner

@timmy-wright timmy-wright Awaiting requested review from timmy-wright timmy-wright will be requested when the pull request is marked ready for review timmy-wright is a code owner

@zachary-bailey zachary-bailey Awaiting requested review from zachary-bailey zachary-bailey will be requested when the pull request is marked ready for review zachary-bailey is a code owner

@awesomenix awesomenix Awaiting requested review from awesomenix awesomenix will be requested when the pull request is marked ready for review awesomenix is a code owner

@mxj220 mxj220 Awaiting requested review from mxj220 mxj220 will be requested when the pull request is marked ready for review mxj220 is a code owner

@pdamianov-dev pdamianov-dev Awaiting requested review from pdamianov-dev pdamianov-dev will be requested when the pull request is marked ready for review pdamianov-dev is a code owner

@calvin197 calvin197 Awaiting requested review from calvin197 calvin197 will be requested when the pull request is marked ready for review calvin197 is a code owner

@sulixu sulixu Awaiting requested review from sulixu sulixu will be requested when the pull request is marked ready for review sulixu is a code owner

@surajssd surajssd Awaiting requested review from surajssd surajssd will be requested when the pull request is marked ready for review surajssd is a code owner

@SriHarsha001 SriHarsha001 Awaiting requested review from SriHarsha001 SriHarsha001 will be requested when the pull request is marked ready for review SriHarsha001 is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@bfjelds