From 0495d98874ce3f97d512ab3dc67170430e589c48 Mon Sep 17 00:00:00 2001 From: Calvin Shum Date: Thu, 20 Feb 2025 23:50:16 -0800 Subject: [PATCH 1/6] AzureLinuxV3 CVM gen2 sig definitions --- pkg/agent/datamodel/sig_config.go | 12 ++++++++++++ pkg/agent/datamodel/sig_config_test.go | 9 ++++++++- pkg/agent/datamodel/types.go | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go index d4c2e6b7e27..7c7e1cfe4d7 100644 --- a/pkg/agent/datamodel/sig_config.go +++ b/pkg/agent/datamodel/sig_config.go @@ -168,6 +168,7 @@ var AvailableContainerdDistros = []Distro{ AKSUbuntuMinimalContainerd2204Gen2, AKSUbuntuContainerd2404, AKSUbuntuContainerd2404Gen2, + AKSAzureLinuxV3CVMGen2, } //nolint:gochecknoglobals @@ -212,6 +213,7 @@ var AvailableGen2Distros = []Distro{ AKSAzureLinuxV2Arm64Gen2, AKSAzureLinuxV3Arm64Gen2, AKSAzureLinuxV3Arm64Gen2FIPS, + AKSAzureLinuxV3CVMGen2, } //nolint:gochecknoglobals @@ -239,6 +241,7 @@ var AvailableAzureLinuxDistros = []Distro{ AKSAzureLinuxV2Gen2TL, AKSAzureLinuxV3Gen2TL, AKSCBLMarinerV2KataGen2TL, + AKSAzureLinuxV3CVMGen2, } //nolint:gochecknoglobals @@ -257,6 +260,7 @@ var AvailableAzureLinuxCgroupV2Distros = []Distro{ AKSAzureLinuxV3Arm64Gen2FIPS, AKSAzureLinuxV2Gen2TL, AKSAzureLinuxV3Gen2TL, + AKSAzureLinuxV3CVMGen2, } // IsContainerdSKU returns true if distro type is containerd-enabled. @@ -811,6 +815,13 @@ var ( Definition: "windows-23H2-gen2", Version: Windows23H2SIGImageVersion, } + + SIGAzureLinuxV3CVMGen2ImageConfigTemplate = SigImageConfigTemplate{ + ResourceGroup: AKSAzureLinuxResourceGroup, + Gallery: AKSAzureLinuxGalleryName, + Definition: "V3cvmgen2", + Version: LinuxSIGImageVersion, + } ) // GetMaintainedLinuxSIGImageConfigMap returns a set of Distro -> SigImageConfig mappings @@ -898,6 +909,7 @@ func getSigAzureLinuxImageConfigMapWithOpts(opts ...SigImageConfigOpt) map[Distr AKSAzureLinuxV3Arm64Gen2FIPS: SIGAzureLinuxV3Arm64Gen2FIPSImageConfigTemplate.WithOptions(opts...), AKSAzureLinuxV2Gen2TL: SIGAzureLinuxV2TLImageConfigTemplate.WithOptions(opts...), AKSAzureLinuxV3Gen2TL: SIGAzureLinuxV3TLImageConfigTemplate.WithOptions(opts...), + AKSAzureLinuxV3CVMGen2: SIGAzureLinuxV3CVMGen2ImageConfigTemplate.WithOptions(opts...), } } diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go index c3dfb258ae7..68beabcd3f5 100644 --- a/pkg/agent/datamodel/sig_config_test.go +++ b/pkg/agent/datamodel/sig_config_test.go @@ -20,6 +20,7 @@ var _ = Describe("GetMaintainedLinuxSIGImageConfigMap", func() { AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(), AKSUbuntuContainerd2204TLGen2: SIGUbuntuContainerd2204TLGen2ImageConfigTemplate.WithOptions(), AKSUbuntuContainerd2004CVMGen2: SIGUbuntuContainerd2004CVMGen2ImageConfigTemplate.WithOptions(), + AKSAzureLinuxV3CVMGen2: SIGAzureLinuxV3CVMGen2ImageConfigTemplate.WithOptions(), AKSUbuntuContainerd2404: SIGUbuntuContainerd2404ImageConfigTemplate.WithOptions(), AKSUbuntuContainerd2404Gen2: SIGUbuntuContainerd2404Gen2ImageConfigTemplate.WithOptions(), AKSCBLMarinerV2: SIGCBLMarinerV2Gen1ImageConfigTemplate.WithOptions(), @@ -106,7 +107,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(mariner.Definition).To(Equal("V1")) Expect(mariner.Version).To(Equal(FrozenCBLMarinerV1SIGImageVersionForDeprecation)) - Expect(len(sigConfig.SigAzureLinuxImageConfig)).To(Equal(14)) + Expect(len(sigConfig.SigAzureLinuxImageConfig)).To(Equal(15)) azurelinuxV2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2] Expect(azurelinuxV2.ResourceGroup).To(Equal("resourcegroup")) @@ -351,5 +352,11 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(aksUbuntu2404Gen2Containerd.Gallery).To(Equal("aksubuntu")) Expect(aksUbuntu2404Gen2Containerd.Definition).To(Equal("2404gen2containerd")) Expect(aksUbuntu2404Gen2Containerd.Version).To(Equal(LinuxSIGImageVersion)) + + azurelinuxV3CVMGen2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Arm64Gen2] + Expect(azurelinuxV3CVMGen2.ResourceGroup).To(Equal("resourcegroup")) + Expect(azurelinuxV3CVMGen2.Gallery).To(Equal("aksazurelinux")) + Expect(azurelinuxV3CVMGen2.Definition).To(Equal("V3cvmgen2")) + Expect(azurelinuxV3CVMGen2.Version).To(Equal(LinuxSIGImageVersion)) }) }) diff --git a/pkg/agent/datamodel/types.go b/pkg/agent/datamodel/types.go index b3aff05afd7..1f767c8ea97 100644 --- a/pkg/agent/datamodel/types.go +++ b/pkg/agent/datamodel/types.go @@ -198,6 +198,7 @@ const ( AKSUbuntuEgressContainerd2204Gen2 Distro = "aks-ubuntu-egress-containerd-22.04-gen2" AKSUbuntuContainerd2404 Distro = "aks-ubuntu-containerd-24.04" AKSUbuntuContainerd2404Gen2 Distro = "aks-ubuntu-containerd-24.04-gen2" + AKSAzureLinuxV3CVMGen2 Distro = "aks-azurelinux-v3-cvm-gen2" RHEL Distro = "rhel" CoreOS Distro = "coreos" @@ -272,6 +273,7 @@ var AKSDistrosAvailableOnVHD = []Distro{ AKSUbuntuContainerd2204, AKSUbuntuContainerd2204Gen2, AKSUbuntuContainerd2004CVMGen2, + AKSAzureLinuxV3CVMGen2, AKSUbuntuArm64Containerd2204Gen2, AKSUbuntuArm64Containerd2404Gen2, AKSCBLMarinerV2Arm64Gen2, From 999901c218cb1e3f54dc60c3393ae757e2e5c3c6 Mon Sep 17 00:00:00 2001 From: Calvin Shum Date: Fri, 21 Feb 2025 00:41:56 -0800 Subject: [PATCH 2/6] Update sig_config_test.go --- pkg/agent/datamodel/sig_config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go index 68beabcd3f5..eebc857db39 100644 --- a/pkg/agent/datamodel/sig_config_test.go +++ b/pkg/agent/datamodel/sig_config_test.go @@ -353,7 +353,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(aksUbuntu2404Gen2Containerd.Definition).To(Equal("2404gen2containerd")) Expect(aksUbuntu2404Gen2Containerd.Version).To(Equal(LinuxSIGImageVersion)) - azurelinuxV3CVMGen2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Arm64Gen2] + azurelinuxV3CVMGen2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3CVMGen2] Expect(azurelinuxV3CVMGen2.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinuxV3CVMGen2.Gallery).To(Equal("aksazurelinux")) Expect(azurelinuxV3CVMGen2.Definition).To(Equal("V3cvmgen2")) From 7ad646aadd72fdaa95673f975ce43650d78fc515 Mon Sep 17 00:00:00 2001 From: Calvin Shum Date: Tue, 25 Feb 2025 18:50:25 -0800 Subject: [PATCH 3/6] add UT to types_test.go --- pkg/agent/datamodel/types_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/agent/datamodel/types_test.go b/pkg/agent/datamodel/types_test.go index bd007c76e73..8bd58f79827 100644 --- a/pkg/agent/datamodel/types_test.go +++ b/pkg/agent/datamodel/types_test.go @@ -1147,6 +1147,13 @@ func TestAgentPoolProfileIsAzureLinuxCgroupV2VHDDistro(t *testing.T) { }, expected: true, }, + { + name: "Azure Linux V3 Gen2 CVM VHD distro", + ap: AgentPoolProfile{ + Distro: AKSAzureLinuxV3CVMGen2, + }, + expected: true, + }, } for _, c := range cases { From fed2da55507acc5d449c80c43a0e50f54fcb9842 Mon Sep 17 00:00:00 2001 From: Calvin Shum Date: Tue, 25 Feb 2025 18:56:14 -0800 Subject: [PATCH 4/6] add UT to bakerapi_test.go --- pkg/agent/bakerapi_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/agent/bakerapi_test.go b/pkg/agent/bakerapi_test.go index 1efe8c64863..64e87a117c5 100644 --- a/pkg/agent/bakerapi_test.go +++ b/pkg/agent/bakerapi_test.go @@ -332,6 +332,7 @@ var _ = Describe("AgentBaker API implementation tests", func() { datamodel.AKSAzureLinuxV3Arm64Gen2, datamodel.AKSAzureLinuxV2Gen2TL, datamodel.AKSAzureLinuxV3Arm64Gen2FIPS, + datamodel.AKSAzureLinuxV3CVMGen2, } allLinuxDistros = append(allLinuxDistros, ubuntuDistros...) From 1e9f0995b47ea4c505bf7fd6a427485ed7ec7be7 Mon Sep 17 00:00:00 2001 From: Calvin Shum Date: Wed, 5 Mar 2025 18:51:51 -0800 Subject: [PATCH 5/6] Update sig_config.go --- pkg/agent/datamodel/sig_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go index 7c7e1cfe4d7..8a49a688ca9 100644 --- a/pkg/agent/datamodel/sig_config.go +++ b/pkg/agent/datamodel/sig_config.go @@ -819,7 +819,7 @@ var ( SIGAzureLinuxV3CVMGen2ImageConfigTemplate = SigImageConfigTemplate{ ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, - Definition: "V3cvmgen2", + Definition: "V3gen2CVM", Version: LinuxSIGImageVersion, } ) From 2840fd52246d150434b84a2ceab0208e225d664e Mon Sep 17 00:00:00 2001 From: Calvin Shum Date: Fri, 7 Mar 2025 00:45:00 -0800 Subject: [PATCH 6/6] fix ut --- pkg/agent/datamodel/sig_config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go index a3fa466d23c..fa9baf5ee8b 100644 --- a/pkg/agent/datamodel/sig_config_test.go +++ b/pkg/agent/datamodel/sig_config_test.go @@ -369,7 +369,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { azurelinuxV3CVMGen2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3CVMGen2] Expect(azurelinuxV3CVMGen2.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinuxV3CVMGen2.Gallery).To(Equal("aksazurelinux")) - Expect(azurelinuxV3CVMGen2.Definition).To(Equal("V3cvmgen2")) + Expect(azurelinuxV3CVMGen2.Definition).To(Equal("V3gen2CVM")) Expect(azurelinuxV3CVMGen2.Version).To(Equal(LinuxSIGImageVersion)) aksUbuntu2404CVMGen2Containerd := sigConfig.SigUbuntuImageConfig[AKSUbuntuContainerd2404CVMGen2]