Skip to content

Commit 1cae077

Browse files
juan-leejuan-lee
authored
feat: add GB200 VHD skeleton infrastructure (#6759)
Signed-off-by: Juan-Lee Pang <[email protected]>
1 parent be4a33f commit 1cae077

File tree

10 files changed

+209
-128
lines changed

10 files changed

+209
-128
lines changed

‎.pipelines/.vsts-vhd-builder-release.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ parameters:
137137
displayName: Build 2404 ARM64 Gen2 containerd
138138
type: boolean
139139
default: true
140+
- name: build2404arm64gb200gen2containerd
141+
displayName: Build 2404 ARM64 GB200 Gen2 Containerd
142+
type: boolean
143+
default: false
140144
- name: build2204containerd
141145
displayName: Build 2204 Gen1 Containerd
142146
type: boolean
@@ -1284,6 +1288,33 @@ stages:
12841288
useOverrides: ${{ parameters.useOverrides }}
12851289
overrideBranch: ${{ parameters.overrideBranch }}
12861290
artifactName: flatcar-gen2-arm64
1291+
- stage: build_vhd_2404_arm64_gb200_gen2_containerd
1292+
condition: eq('${{ parameters.build2404arm64gb200gen2containerd }}', true)
1293+
dependsOn: []
1294+
jobs:
1295+
- job: build2404arm64gb200gen2containerd
1296+
timeoutInMinutes: 180
1297+
steps:
1298+
- bash: |
1299+
echo '##vso[task.setvariable variable=OS_SKU]Ubuntu'
1300+
echo '##vso[task.setvariable variable=OS_VERSION]24.04'
1301+
echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
1302+
echo '##vso[task.setvariable variable=IMG_OFFER]ubuntu-24_04-lts'
1303+
echo '##vso[task.setvariable variable=IMG_SKU]server-arm64'
1304+
echo '##vso[task.setvariable variable=IMG_VERSION]latest'
1305+
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
1306+
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16pds_v5'
1307+
echo '##vso[task.setvariable variable=FEATURE_FLAGS]GB200'
1308+
echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
1309+
echo '##vso[task.setvariable variable=ARCHITECTURE]ARM64'
1310+
echo '##vso[task.setvariable variable=ENABLE_FIPS]False'
1311+
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
1312+
displayName: Setup Build Variables
1313+
- template: ./templates/.builder-release-template.yaml
1314+
parameters:
1315+
useOverrides: ${{ parameters.useOverrides }}
1316+
overrideBranch: ${{ parameters.overrideBranch }}
1317+
artifactName: 2404-arm64-gb200-gen2-containerd
12871318
- stage: e2e
12881319
condition: and(succeeded(), ne(variables.SKIP_E2E_TESTS, 'true'))
12891320
variables:

‎.pipelines/templates/.builder-release-template.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ steps:
9595
SKU_NAME=${OS_VERSION} && \
9696
if [[ "${HYPERV_GENERATION,,}" == "v2" ]]; then SKU_NAME="${SKU_NAME}gen2"; fi && \
9797
if [[ "${ARCHITECTURE,,}" == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
98+
if grep -q "GB200" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}gb200"; fi && \
9899
if [[ "${ENABLE_FIPS,,}" == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
99100
if grep -q "cvm" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}CVM"; fi && \
100101
if [[ "${IMG_SKU}" == *"minimal"* ]]; then SKU_NAME="${SKU_NAME}minimal"; fi && \

‎pkg/agent/datamodel/gpu_components.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ var FabricManagerGPUSizes = map[string]bool{
120120
"standard_nd96is_h200_v5": true,
121121
"standard_nd96isr_h200_v5": true,
122122
"standard_nd96isrf_h200_v5": true,
123+
// GB200 (Grace Blackwell)
124+
"standard_nd128isr_ndr_gb200_v6": true,
123125
// A100 oddballs.
124126
"standard_nc24ads_a100_v4": false, // NCads_v4 will fail to start fabricmanager.
125127
"standard_nc48ads_a100_v4": false,

‎pkg/agent/datamodel/sig_config.go‎

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ var AvailableUbuntu2404Distros = []Distro{
120120
AKSUbuntuContainerd2404,
121121
AKSUbuntuContainerd2404Gen2,
122122
AKSUbuntuArm64Containerd2404Gen2,
123+
AKSUbuntuArm64GB200Containerd2404Gen2,
123124
AKSUbuntuContainerd2404CVMGen2,
124125
AKSUbuntuContainerd2404TLGen2,
125126
}
@@ -162,6 +163,7 @@ var AvailableContainerdDistros = []Distro{
162163
AKSCBLMarinerV2KataGen2TL,
163164
AKSUbuntuArm64Containerd2204Gen2,
164165
AKSUbuntuArm64Containerd2404Gen2,
166+
AKSUbuntuArm64GB200Containerd2404Gen2,
165167
AKSUbuntuContainerd2404CVMGen2,
166168
AKSCBLMarinerV2Arm64Gen2,
167169
AKSAzureLinuxV2Arm64Gen2,
@@ -201,6 +203,7 @@ var AvailableGen2Distros = []Distro{
201203
AKSUbuntuEdgeZoneContainerd1804Gen2,
202204
AKSUbuntuArm64Containerd2204Gen2,
203205
AKSUbuntuArm64Containerd2404Gen2,
206+
AKSUbuntuArm64GB200Containerd2404Gen2,
204207
AKSUbuntuContainerd2404CVMGen2,
205208
AKSUbuntuContainerd2204Gen2,
206209
AKSUbuntuContainerd2004CVMGen2,
@@ -584,6 +587,13 @@ var (
584587
Version: LinuxSIGImageVersion,
585588
}
586589

590+
SIGUbuntuArm64GB200Containerd2404Gen2ImageConfigTemplate = SigImageConfigTemplate{
591+
ResourceGroup: AKSUbuntuResourceGroup,
592+
Gallery: AKSUbuntuGalleryName,
593+
Definition: "2404arm64gb200gen2containerd",
594+
Version: LinuxSIGImageVersion,
595+
}
596+
587597
SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate = SigImageConfigTemplate{
588598
ResourceGroup: AKSUbuntuResourceGroup,
589599
Gallery: AKSUbuntuGalleryName,
@@ -939,34 +949,35 @@ func GetMaintainedLinuxSIGImageConfigMap() map[Distro]SigImageConfig {
939949

940950
func getSigUbuntuImageConfigMapWithOpts(opts ...SigImageConfigOpt) map[Distro]SigImageConfig {
941951
return map[Distro]SigImageConfig{
942-
AKSUbuntu1604: SIGUbuntu1604ImageConfigTemplate.WithOptions(opts...),
943-
AKSUbuntu1804: SIGUbuntu1804ImageConfigTemplate.WithOptions(opts...),
944-
AKSUbuntu1804Gen2: SIGUbuntu1804Gen2ImageConfigTemplate.WithOptions(opts...),
945-
AKSUbuntuGPU1804: SIGUbuntuGPU1804ImageConfigTemplate.WithOptions(opts...),
946-
AKSUbuntuGPU1804Gen2: SIGUbuntuGPU1804Gen2ImageConfigTemplate.WithOptions(opts...),
947-
AKSUbuntuContainerd1804: SIGUbuntuContainerd1804ImageConfigTemplate.WithOptions(opts...),
948-
AKSUbuntuContainerd1804Gen2: SIGUbuntuContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
949-
AKSUbuntuGPUContainerd1804: SIGUbuntuGPUContainerd1804ImageConfigTemplate.WithOptions(opts...),
950-
AKSUbuntuGPUContainerd1804Gen2: SIGUbuntuGPUContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
951-
AKSUbuntuFipsContainerd1804: SIGUbuntuFipsContainerd1804ImageConfigTemplate.WithOptions(opts...),
952-
AKSUbuntuFipsContainerd1804Gen2: SIGUbuntuFipsContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
953-
AKSUbuntuFipsContainerd2004: SIGUbuntuFipsContainerd2004ImageConfigTemplate.WithOptions(opts...),
954-
AKSUbuntuFipsContainerd2004Gen2: SIGUbuntuFipsContainerd2004Gen2ImageConfigTemplate.WithOptions(opts...),
955-
AKSUbuntuFipsContainerd2204: SIGUbuntuFipsContainerd2204ImageConfigTemplate.WithOptions(opts...),
956-
AKSUbuntuFipsContainerd2204Gen2: SIGUbuntuFipsContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
957-
AKSUbuntuContainerd2204: SIGUbuntuContainerd2204ImageConfigTemplate.WithOptions(opts...),
958-
AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
959-
AKSUbuntuContainerd2004CVMGen2: SIGUbuntuContainerd2004CVMGen2ImageConfigTemplate.WithOptions(opts...),
960-
AKSUbuntuArm64Containerd2204Gen2: SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
961-
AKSUbuntuArm64Containerd2404Gen2: SIGUbuntuArm64Containerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
962-
AKSUbuntuContainerd2404CVMGen2: SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate.WithOptions(opts...),
963-
AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(opts...),
964-
AKSUbuntuMinimalContainerd2204: SIGUbuntuMinimalContainerd2204ImageConfigTemplate.WithOptions(opts...),
965-
AKSUbuntuMinimalContainerd2204Gen2: SIGUbuntuMinimalContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
966-
AKSUbuntuEgressContainerd2204Gen2: SIGUbuntuEgressContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
967-
AKSUbuntuContainerd2404: SIGUbuntuContainerd2404ImageConfigTemplate.WithOptions(opts...),
968-
AKSUbuntuContainerd2404Gen2: SIGUbuntuContainerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
969-
AKSUbuntuContainerd2404TLGen2: SIGUbuntuContainerd2404TLGen2ImageConfigTemplate.WithOptions(opts...),
952+
AKSUbuntu1604: SIGUbuntu1604ImageConfigTemplate.WithOptions(opts...),
953+
AKSUbuntu1804: SIGUbuntu1804ImageConfigTemplate.WithOptions(opts...),
954+
AKSUbuntu1804Gen2: SIGUbuntu1804Gen2ImageConfigTemplate.WithOptions(opts...),
955+
AKSUbuntuGPU1804: SIGUbuntuGPU1804ImageConfigTemplate.WithOptions(opts...),
956+
AKSUbuntuGPU1804Gen2: SIGUbuntuGPU1804Gen2ImageConfigTemplate.WithOptions(opts...),
957+
AKSUbuntuContainerd1804: SIGUbuntuContainerd1804ImageConfigTemplate.WithOptions(opts...),
958+
AKSUbuntuContainerd1804Gen2: SIGUbuntuContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
959+
AKSUbuntuGPUContainerd1804: SIGUbuntuGPUContainerd1804ImageConfigTemplate.WithOptions(opts...),
960+
AKSUbuntuGPUContainerd1804Gen2: SIGUbuntuGPUContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
961+
AKSUbuntuFipsContainerd1804: SIGUbuntuFipsContainerd1804ImageConfigTemplate.WithOptions(opts...),
962+
AKSUbuntuFipsContainerd1804Gen2: SIGUbuntuFipsContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
963+
AKSUbuntuFipsContainerd2004: SIGUbuntuFipsContainerd2004ImageConfigTemplate.WithOptions(opts...),
964+
AKSUbuntuFipsContainerd2004Gen2: SIGUbuntuFipsContainerd2004Gen2ImageConfigTemplate.WithOptions(opts...),
965+
AKSUbuntuFipsContainerd2204: SIGUbuntuFipsContainerd2204ImageConfigTemplate.WithOptions(opts...),
966+
AKSUbuntuFipsContainerd2204Gen2: SIGUbuntuFipsContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
967+
AKSUbuntuContainerd2204: SIGUbuntuContainerd2204ImageConfigTemplate.WithOptions(opts...),
968+
AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
969+
AKSUbuntuContainerd2004CVMGen2: SIGUbuntuContainerd2004CVMGen2ImageConfigTemplate.WithOptions(opts...),
970+
AKSUbuntuArm64Containerd2204Gen2: SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
971+
AKSUbuntuArm64Containerd2404Gen2: SIGUbuntuArm64Containerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
972+
AKSUbuntuArm64GB200Containerd2404Gen2: SIGUbuntuArm64GB200Containerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
973+
AKSUbuntuContainerd2404CVMGen2: SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate.WithOptions(opts...),
974+
AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(opts...),
975+
AKSUbuntuMinimalContainerd2204: SIGUbuntuMinimalContainerd2204ImageConfigTemplate.WithOptions(opts...),
976+
AKSUbuntuMinimalContainerd2204Gen2: SIGUbuntuMinimalContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
977+
AKSUbuntuEgressContainerd2204Gen2: SIGUbuntuEgressContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
978+
AKSUbuntuContainerd2404: SIGUbuntuContainerd2404ImageConfigTemplate.WithOptions(opts...),
979+
AKSUbuntuContainerd2404Gen2: SIGUbuntuContainerd2404Gen2ImageConfigTemplate.WithOptions(opts...),
980+
AKSUbuntuContainerd2404TLGen2: SIGUbuntuContainerd2404TLGen2ImageConfigTemplate.WithOptions(opts...),
970981
}
971982
}
972983

‎pkg/agent/datamodel/sig_config_test.go‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,42 @@ import (
88
var _ = Describe("GetMaintainedLinuxSIGImageConfigMap", func() {
99
It("should return the correct value", func() {
1010
expected := map[Distro]SigImageConfig{
11-
AKSUbuntuFipsContainerd2004: SIGUbuntuFipsContainerd2004ImageConfigTemplate.WithOptions(),
12-
AKSUbuntuFipsContainerd2004Gen2: SIGUbuntuFipsContainerd2004Gen2ImageConfigTemplate.WithOptions(),
13-
AKSUbuntuArm64Containerd2204Gen2: SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate.WithOptions(),
14-
AKSUbuntuArm64Containerd2404Gen2: SIGUbuntuArm64Containerd2404Gen2ImageConfigTemplate.WithOptions(),
15-
AKSUbuntuContainerd2204: SIGUbuntuContainerd2204ImageConfigTemplate.WithOptions(),
16-
AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(),
17-
AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(),
18-
AKSUbuntuContainerd2004CVMGen2: SIGUbuntuContainerd2004CVMGen2ImageConfigTemplate.WithOptions(),
19-
AKSAzureLinuxV3CVMGen2: SIGAzureLinuxV3CVMGen2ImageConfigTemplate.WithOptions(),
20-
AKSUbuntuContainerd2404: SIGUbuntuContainerd2404ImageConfigTemplate.WithOptions(),
21-
AKSUbuntuContainerd2404Gen2: SIGUbuntuContainerd2404Gen2ImageConfigTemplate.WithOptions(),
22-
AKSCBLMarinerV2: SIGCBLMarinerV2Gen1ImageConfigTemplate.WithOptions(),
23-
AKSAzureLinuxV2: SIGAzureLinuxV2Gen1ImageConfigTemplate.WithOptions(),
24-
AKSAzureLinuxV3: SIGAzureLinuxV3Gen1ImageConfigTemplate.WithOptions(),
25-
AKSCBLMarinerV2Gen2: SIGCBLMarinerV2Gen2ImageConfigTemplate.WithOptions(),
26-
AKSAzureLinuxV2Gen2: SIGAzureLinuxV2Gen2ImageConfigTemplate.WithOptions(),
27-
AKSAzureLinuxV3Gen2: SIGAzureLinuxV3Gen2ImageConfigTemplate.WithOptions(),
28-
AKSCBLMarinerV2FIPS: SIGCBLMarinerV2Gen1FIPSImageConfigTemplate.WithOptions(),
29-
AKSAzureLinuxV2FIPS: SIGAzureLinuxV2Gen1FIPSImageConfigTemplate.WithOptions(),
30-
AKSAzureLinuxV3FIPS: SIGAzureLinuxV3Gen1FIPSImageConfigTemplate.WithOptions(),
31-
AKSCBLMarinerV2Gen2FIPS: SIGCBLMarinerV2Gen2FIPSImageConfigTemplate.WithOptions(),
32-
AKSAzureLinuxV2Gen2FIPS: SIGAzureLinuxV2Gen2FIPSImageConfigTemplate.WithOptions(),
33-
AKSAzureLinuxV3Gen2FIPS: SIGAzureLinuxV3Gen2FIPSImageConfigTemplate.WithOptions(),
34-
AKSCBLMarinerV2Gen2Kata: SIGCBLMarinerV2KataImageConfigTemplate.WithOptions(),
35-
AKSAzureLinuxV2Gen2Kata: SIGAzureLinuxV2KataImageConfigTemplate.WithOptions(),
36-
AKSAzureLinuxV3Gen2Kata: SIGAzureLinuxV3KataImageConfigTemplate.WithOptions(),
37-
AKSCBLMarinerV2Arm64Gen2: SIGCBLMarinerV2Arm64ImageConfigTemplate.WithOptions(),
38-
AKSAzureLinuxV2Arm64Gen2: SIGAzureLinuxV2Arm64ImageConfigTemplate.WithOptions(),
39-
AKSAzureLinuxV3Arm64Gen2: SIGAzureLinuxV3Arm64ImageConfigTemplate.WithOptions(),
40-
AKSAzureLinuxV3Arm64Gen2FIPS: SIGAzureLinuxV3Arm64Gen2FIPSImageConfigTemplate.WithOptions(),
41-
AKSCBLMarinerV2Gen2TL: SIGCBLMarinerV2TLImageConfigTemplate.WithOptions(),
42-
AKSAzureLinuxV2Gen2TL: SIGAzureLinuxV2TLImageConfigTemplate.WithOptions(),
43-
AKSAzureLinuxV3Gen2TL: SIGAzureLinuxV3TLImageConfigTemplate.WithOptions(),
44-
AKSUbuntuContainerd2404CVMGen2: SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate.WithOptions(),
45-
AKSUbuntuContainerd2404TLGen2: SIGUbuntuContainerd2404TLGen2ImageConfigTemplate.WithOptions(),
11+
AKSUbuntuFipsContainerd2004: SIGUbuntuFipsContainerd2004ImageConfigTemplate.WithOptions(),
12+
AKSUbuntuFipsContainerd2004Gen2: SIGUbuntuFipsContainerd2004Gen2ImageConfigTemplate.WithOptions(),
13+
AKSUbuntuArm64Containerd2204Gen2: SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate.WithOptions(),
14+
AKSUbuntuArm64Containerd2404Gen2: SIGUbuntuArm64Containerd2404Gen2ImageConfigTemplate.WithOptions(),
15+
AKSUbuntuArm64GB200Containerd2404Gen2: SIGUbuntuArm64GB200Containerd2404Gen2ImageConfigTemplate.WithOptions(),
16+
AKSUbuntuContainerd2204: SIGUbuntuContainerd2204ImageConfigTemplate.WithOptions(),
17+
AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(),
18+
AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(),
19+
AKSUbuntuContainerd2004CVMGen2: SIGUbuntuContainerd2004CVMGen2ImageConfigTemplate.WithOptions(),
20+
AKSAzureLinuxV3CVMGen2: SIGAzureLinuxV3CVMGen2ImageConfigTemplate.WithOptions(),
21+
AKSUbuntuContainerd2404: SIGUbuntuContainerd2404ImageConfigTemplate.WithOptions(),
22+
AKSUbuntuContainerd2404Gen2: SIGUbuntuContainerd2404Gen2ImageConfigTemplate.WithOptions(),
23+
AKSCBLMarinerV2: SIGCBLMarinerV2Gen1ImageConfigTemplate.WithOptions(),
24+
AKSAzureLinuxV2: SIGAzureLinuxV2Gen1ImageConfigTemplate.WithOptions(),
25+
AKSAzureLinuxV3: SIGAzureLinuxV3Gen1ImageConfigTemplate.WithOptions(),
26+
AKSCBLMarinerV2Gen2: SIGCBLMarinerV2Gen2ImageConfigTemplate.WithOptions(),
27+
AKSAzureLinuxV2Gen2: SIGAzureLinuxV2Gen2ImageConfigTemplate.WithOptions(),
28+
AKSAzureLinuxV3Gen2: SIGAzureLinuxV3Gen2ImageConfigTemplate.WithOptions(),
29+
AKSCBLMarinerV2FIPS: SIGCBLMarinerV2Gen1FIPSImageConfigTemplate.WithOptions(),
30+
AKSAzureLinuxV2FIPS: SIGAzureLinuxV2Gen1FIPSImageConfigTemplate.WithOptions(),
31+
AKSAzureLinuxV3FIPS: SIGAzureLinuxV3Gen1FIPSImageConfigTemplate.WithOptions(),
32+
AKSCBLMarinerV2Gen2FIPS: SIGCBLMarinerV2Gen2FIPSImageConfigTemplate.WithOptions(),
33+
AKSAzureLinuxV2Gen2FIPS: SIGAzureLinuxV2Gen2FIPSImageConfigTemplate.WithOptions(),
34+
AKSAzureLinuxV3Gen2FIPS: SIGAzureLinuxV3Gen2FIPSImageConfigTemplate.WithOptions(),
35+
AKSCBLMarinerV2Gen2Kata: SIGCBLMarinerV2KataImageConfigTemplate.WithOptions(),
36+
AKSAzureLinuxV2Gen2Kata: SIGAzureLinuxV2KataImageConfigTemplate.WithOptions(),
37+
AKSAzureLinuxV3Gen2Kata: SIGAzureLinuxV3KataImageConfigTemplate.WithOptions(),
38+
AKSCBLMarinerV2Arm64Gen2: SIGCBLMarinerV2Arm64ImageConfigTemplate.WithOptions(),
39+
AKSAzureLinuxV2Arm64Gen2: SIGAzureLinuxV2Arm64ImageConfigTemplate.WithOptions(),
40+
AKSAzureLinuxV3Arm64Gen2: SIGAzureLinuxV3Arm64ImageConfigTemplate.WithOptions(),
41+
AKSAzureLinuxV3Arm64Gen2FIPS: SIGAzureLinuxV3Arm64Gen2FIPSImageConfigTemplate.WithOptions(),
42+
AKSCBLMarinerV2Gen2TL: SIGCBLMarinerV2TLImageConfigTemplate.WithOptions(),
43+
AKSAzureLinuxV2Gen2TL: SIGAzureLinuxV2TLImageConfigTemplate.WithOptions(),
44+
AKSAzureLinuxV3Gen2TL: SIGAzureLinuxV3TLImageConfigTemplate.WithOptions(),
45+
AKSUbuntuContainerd2404CVMGen2: SIGUbuntuContainerd2404CVMGen2ImageConfigTemplate.WithOptions(),
46+
AKSUbuntuContainerd2404TLGen2: SIGUbuntuContainerd2404TLGen2ImageConfigTemplate.WithOptions(),
4647
}
4748
Expect(GetMaintainedLinuxSIGImageConfigMap()).To(Equal(expected))
4849
})
@@ -94,7 +95,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
9495
Expect(sigConfig.SigTenantID).To(Equal("sometenantid"))
9596
Expect(sigConfig.SubscriptionID).To(Equal("somesubid"))
9697

97-
Expect(len(sigConfig.SigUbuntuImageConfig)).To(Equal(28))
98+
Expect(len(sigConfig.SigUbuntuImageConfig)).To(Equal(29))
9899

99100
aksUbuntuGPU1804Gen2 := sigConfig.SigUbuntuImageConfig[AKSUbuntuGPU1804Gen2]
100101
Expect(aksUbuntuGPU1804Gen2.ResourceGroup).To(Equal("resourcegroup"))

0 commit comments

Comments
 (0)