Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .pipelines/.vsts-vhd-builder-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ parameters:
displayName: Build 2404 ARM64 GB200 Gen2 Containerd
type: boolean
default: true
- name: build2404arm64gb300gen2containerd
displayName: Build 2404 ARM64 GB300 Gen2 Containerd
type: boolean
default: false
- name: build2204containerd
displayName: Build 2204 Gen1 Containerd
type: boolean
Expand Down Expand Up @@ -1305,6 +1309,30 @@ stages:
useOverrides: ${{ parameters.useOverrides }}
overrideBranch: ${{ parameters.overrideBranch }}
artifactName: 2404-arm64-gb200-gen2-containerd
- job: build2404arm64gb300gen2containerd
condition: eq('${{ parameters.build2404arm64gb300gen2containerd }}', true)
dependsOn: [ ]
timeoutInMinutes: 180
steps:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]Ubuntu'
echo '##vso[task.setvariable variable=OS_VERSION]24.04'
echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
echo '##vso[task.setvariable variable=IMG_OFFER]ubuntu-24_04-lts'
echo '##vso[task.setvariable variable=IMG_SKU]server-arm64'
echo '##vso[task.setvariable variable=IMG_VERSION]latest'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16pds_v5'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]GB300'
echo '##vso[task.setvariable variable=ARCHITECTURE]ARM64'
echo '##vso[task.setvariable variable=ENABLE_FIPS]False'
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
displayName: Setup Build Variables
- template: ./templates/.builder-release-template.yaml
parameters:
useOverrides: ${{ parameters.useOverrides }}
overrideBranch: ${{ parameters.overrideBranch }}
artifactName: 2404-arm64-gb300-gen2-containerd
- stage: e2e
condition: and(succeeded(), ne(variables.SKIP_E2E_TESTS, 'true'))
variables:
Expand Down
1 change: 1 addition & 0 deletions .pipelines/templates/.builder-release-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ steps:
if [[ "${HYPERV_GENERATION,,}" == "v2" ]]; then SKU_NAME="${SKU_NAME}gen2"; fi && \
if [[ "${ARCHITECTURE,,}" == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
if grep -q "GB200" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}gb200"; fi && \
if grep -q "GB300" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}gb300"; fi && \
if [[ "${ENABLE_FIPS,,}" == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
if grep -q "cvm" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}CVM"; fi && \
if [[ "${IMG_SKU}" == *"minimal"* ]]; then SKU_NAME="${SKU_NAME}minimal"; fi && \
Expand Down
11 changes: 11 additions & 0 deletions pkg/agent/datamodel/sig_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ var AvailableUbuntu2404Distros = []Distro{
AKSUbuntuContainerd2404Gen2,
AKSUbuntuArm64Containerd2404Gen2,
AKSUbuntuArm64GB200Containerd2404Gen2,
AKSUbuntuArm64GB300Containerd2404Gen2,
AKSUbuntuContainerd2404CVMGen2,
AKSUbuntuContainerd2404TLGen2,
}
Expand Down Expand Up @@ -138,6 +139,7 @@ var AvailableContainerdDistros = []Distro{
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuArm64Containerd2404Gen2,
AKSUbuntuArm64GB200Containerd2404Gen2,
AKSUbuntuArm64GB300Containerd2404Gen2,
AKSUbuntuContainerd2404CVMGen2,
AKSCBLMarinerV2Arm64Gen2,
AKSAzureLinuxV2Arm64Gen2,
Expand Down Expand Up @@ -165,6 +167,7 @@ var AvailableGen2Distros = []Distro{
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuArm64Containerd2404Gen2,
AKSUbuntuArm64GB200Containerd2404Gen2,
AKSUbuntuArm64GB300Containerd2404Gen2,
AKSUbuntuContainerd2404CVMGen2,
AKSUbuntuContainerd2204Gen2,
AKSUbuntuContainerd2004CVMGen2,
Expand Down Expand Up @@ -456,6 +459,13 @@ var (
Version: LinuxSIGImageVersion,
}

SIGUbuntuArm64GB300Containerd2404Gen2ImageConfigTemplate = SigImageConfigTemplate{
ResourceGroup: AKSUbuntuResourceGroup,
Gallery: AKSUbuntuGalleryName,
Definition: "2404gen2arm64gb300containerd",
Version: LinuxSIGImageVersion,
}

SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate = SigImageConfigTemplate{
ResourceGroup: AKSUbuntuResourceGroup,
Gallery: AKSUbuntuGalleryName,
Expand Down Expand Up @@ -830,6 +840,7 @@ func getSigUbuntuImageConfigMapWithOpts(opts ...SigImageConfigOpt) map[Distro]Si
AKSUbuntuArm64Containerd2204Gen2: SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuArm64Containerd2404Gen2: SIGUbuntuArm64Containerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuArm64GB200Containerd2404Gen2: SIGUbuntuArm64GB200Containerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuArm64GB300Containerd2404Gen2: SIGUbuntuArm64GB300Containerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuContainerd2404CVMGen2: SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuMinimalContainerd2204: SIGUbuntuMinimalContainerd2204ImageConfigTemplate.WithOptions(opts...),
Expand Down
1 change: 1 addition & 0 deletions pkg/agent/datamodel/sig_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var _ = Describe("GetMaintainedLinuxSIGImageConfigMap", func() {
AKSUbuntuArm64Containerd2204Gen2: SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate.WithOptions(),
AKSUbuntuArm64Containerd2404Gen2: SIGUbuntuArm64Containerd2404Gen2ImageConfigTemplate.WithOptions(),
AKSUbuntuArm64GB200Containerd2404Gen2: SIGUbuntuArm64GB200Containerd2404Gen2ImageConfigTemplate.WithOptions(),
AKSUbuntuArm64GB300Containerd2404Gen2: SIGUbuntuArm64GB300Containerd2404Gen2ImageConfigTemplate.WithOptions(),
AKSUbuntuContainerd2204: SIGUbuntuContainerd2204ImageConfigTemplate.WithOptions(),
AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(),
AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(),
Expand Down
2 changes: 2 additions & 0 deletions pkg/agent/datamodel/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ const (
AKSUbuntuArm64Containerd2204Gen2 Distro = "aks-ubuntu-arm64-containerd-22.04-gen2"
AKSUbuntuArm64Containerd2404Gen2 Distro = "aks-ubuntu-arm64-containerd-24.04-gen2"
AKSUbuntuArm64GB200Containerd2404Gen2 Distro = "aks-ubuntu-arm64-gb200-containerd-24.04-gen2"
AKSUbuntuArm64GB300Containerd2404Gen2 Distro = "aks-ubuntu-arm64-gb300-containerd-24.04-gen2"
AKSUbuntuContainerd2404CVMGen2 Distro = "aks-ubuntu-containerd-24.04-cvm-gen2"
AKSCBLMarinerV2Arm64Gen2 Distro = "aks-cblmariner-v2-arm64-gen2"
AKSAzureLinuxV2Arm64Gen2 Distro = "aks-azurelinux-v2-arm64-gen2"
Expand Down Expand Up @@ -257,6 +258,7 @@ var AKSDistrosAvailableOnVHD = []Distro{
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuArm64Containerd2404Gen2,
AKSUbuntuArm64GB200Containerd2404Gen2,
AKSUbuntuArm64GB300Containerd2404Gen2,
AKSUbuntuContainerd2404CVMGen2,
AKSCBLMarinerV2Arm64Gen2,
AKSAzureLinuxV2Arm64Gen2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ elif [ "${OS_TYPE}" = "Linux" ] && grep -q "cvm" <<< "$FEATURE_FLAGS"; then
} \
} \
}"
elif [ "${OS_TYPE}" = "Linux" ] && grep -q "GB200" <<< "$FEATURE_FLAGS"; then
echo "GB200: Creating standard disk from SIG image"
# GB200 uses standard disk creation for now, but can be customized in the future if needed
elif [ "${OS_TYPE}" = "Linux" ] && grep -q "GB[23]00" <<< "$FEATURE_FLAGS"; then
echo "GB200/GB300: Creating standard disk from SIG image"
# GB200/GB300 uses standard disk creation for now, but can be customized in the future if needed
az resource create --id $disk_resource_id --api-version 2024-03-02 --is-full-object --location $LOCATION --properties "{\"location\": \"$LOCATION\", \
\"properties\": { \
\"osType\": \"$OS_TYPE\", \
Expand Down Expand Up @@ -176,4 +176,4 @@ fi
capture_benchmark "${SCRIPT_NAME}_revoke_access_and_delete_disk"

capture_benchmark "${SCRIPT_NAME}_overall" true
process_benchmarks
process_benchmarks
Loading