Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: AzureLinuxV3 CVM gen2 sig definitions #5898

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

feat: AzureLinuxV3 CVM gen2 sig definitions #5898

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0495d98
AzureLinuxV3 CVM gen2 sig definitions
calvin197 Feb 21, 2025
999901c
Update sig_config_test.go
calvin197 Feb 21, 2025
7ad646a
add UT to types_test.go
calvin197 Feb 26, 2025
fed2da5
add UT to bakerapi_test.go
calvin197 Feb 26, 2025
1e9f099
Update sig_config.go
calvin197 Mar 6, 2025
ff4beac
Merge branch 'master' into calvinshum/azv3cvm-sigconfig
calvin197 Mar 7, 2025
2840fd5
fix ut
calvin197 Mar 7, 2025
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
12 changes: 12 additions & 0 deletions pkg/agent/datamodel/sig_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ var AvailableContainerdDistros = []Distro{
AKSUbuntuMinimalContainerd2204Gen2,
AKSUbuntuContainerd2404,
AKSUbuntuContainerd2404Gen2,
AKSAzureLinuxV3CVMGen2,
}

//nolint:gochecknoglobals
Expand Down Expand Up @@ -212,6 +213,7 @@ var AvailableGen2Distros = []Distro{
AKSAzureLinuxV2Arm64Gen2,
AKSAzureLinuxV3Arm64Gen2,
AKSAzureLinuxV3Arm64Gen2FIPS,
AKSAzureLinuxV3CVMGen2,
}

//nolint:gochecknoglobals
Expand Down Expand Up @@ -239,6 +241,7 @@ var AvailableAzureLinuxDistros = []Distro{
AKSAzureLinuxV2Gen2TL,
AKSAzureLinuxV3Gen2TL,
AKSCBLMarinerV2KataGen2TL,
AKSAzureLinuxV3CVMGen2,
}

//nolint:gochecknoglobals
Expand All @@ -257,6 +260,7 @@ var AvailableAzureLinuxCgroupV2Distros = []Distro{
AKSAzureLinuxV3Arm64Gen2FIPS,
AKSAzureLinuxV2Gen2TL,
AKSAzureLinuxV3Gen2TL,
AKSAzureLinuxV3CVMGen2,
}

// IsContainerdSKU returns true if distro type is containerd-enabled.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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...),
}
}

Expand Down
9 changes: 8 additions & 1 deletion pkg/agent/datamodel/sig_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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[AKSAzureLinuxV3CVMGen2]
Expect(azurelinuxV3CVMGen2.ResourceGroup).To(Equal("resourcegroup"))
Expect(azurelinuxV3CVMGen2.Gallery).To(Equal("aksazurelinux"))
Expect(azurelinuxV3CVMGen2.Definition).To(Equal("V3cvmgen2"))
Expect(azurelinuxV3CVMGen2.Version).To(Equal(LinuxSIGImageVersion))
})
})
2 changes: 2 additions & 0 deletions pkg/agent/datamodel/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -272,6 +273,7 @@ var AKSDistrosAvailableOnVHD = []Distro{
AKSUbuntuContainerd2204,
AKSUbuntuContainerd2204Gen2,
AKSUbuntuContainerd2004CVMGen2,
AKSAzureLinuxV3CVMGen2,
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuArm64Containerd2404Gen2,
AKSCBLMarinerV2Arm64Gen2,
Expand Down
Loading