chore: unpin the AzureLinux V3 images, and build them by default (#5095)

This commit is contained in:
aadhar-agarwal 2024-10-16 10:35:21 -07:00 коммит произвёл GitHub
Родитель 1764118c9c
Коммит f3ee789c93
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
3 изменённых файлов: 15 добавлений и 18 удалений

Просмотреть файл

@ -43,7 +43,7 @@ parameters:
- name: buildAzureLinuxV3gen1
displayName: Build AzureLinuxV3 Gen1
type: boolean
default: false
default: true
- name: buildMarinerV2gen2
displayName: Build MarinerV2 Gen2
type: boolean
@ -55,7 +55,7 @@ parameters:
- name: buildAzureLinuxV3gen2
displayName: Build AzureLinuxV3 Gen2
type: boolean
default: false
default: true
- name: buildMarinerV2gen1fips
displayName: Build MarinerV2 Gen1 FIPS
type: boolean
@ -67,7 +67,7 @@ parameters:
- name: buildAzureLinuxV3gen1fips
displayName: Build AzureLinuxV3 Gen1 FIPS
type: boolean
default: false
default: true
- name: buildMarinerV2gen2fips
displayName: Build MarinerV2 Gen2 FIPS
type: boolean
@ -79,7 +79,7 @@ parameters:
- name: buildAzureLinuxV3gen2fips
displayName: Build AzureLinuxV3 Gen2 FIPS
type: boolean
default: false
default: true
- name: buildMarinerV2gen2kata
displayName: Build MarinerV2 Gen2 Kata
type: boolean
@ -99,7 +99,7 @@ parameters:
- name: buildAzureLinuxV3ARM64
displayName: Build AzureLinuxV3 Gen2 - ARM64
type: boolean
default: false
default: true
- name: buildMarinerV2gen2TrustedLaunch
displayName: Build MarinerV2 Gen2 - Trusted Launch
type: boolean

Просмотреть файл

@ -374,9 +374,6 @@ const (
// of support and image builds have stopped.
FrozenCBLMarinerV1SIGImageVersionForDeprecation string = "202308.28.0"
// AzureLinuxV3 pinned to 202409.23.0 for testing.
FrozenAzureLinuxV3SIGImageVersion string = "202409.23.0"
// This is currently for testing only, we do not build 2404 images regularly
// Once 2404 is preview in AKS, we will refer to the images using regular LinuxSIGImageVersion and remove this.
Ubuntu2404SIGImageVersionForTest string = "202405.20.0"
@ -633,7 +630,7 @@ var (
ResourceGroup: AKSAzureLinuxResourceGroup,
Gallery: AKSAzureLinuxGalleryName,
Definition: "V3",
Version: FrozenAzureLinuxV3SIGImageVersion,
Version: LinuxSIGImageVersion,
}
SIGCBLMarinerV2Gen2ImageConfigTemplate = SigImageConfigTemplate{
@ -654,7 +651,7 @@ var (
ResourceGroup: AKSAzureLinuxResourceGroup,
Gallery: AKSAzureLinuxGalleryName,
Definition: "V3gen2",
Version: FrozenAzureLinuxV3SIGImageVersion,
Version: LinuxSIGImageVersion,
}
SIGCBLMarinerV2Gen1FIPSImageConfigTemplate = SigImageConfigTemplate{
@ -675,7 +672,7 @@ var (
ResourceGroup: AKSAzureLinuxResourceGroup,
Gallery: AKSAzureLinuxGalleryName,
Definition: "V3fips",
Version: FrozenAzureLinuxV3SIGImageVersion,
Version: LinuxSIGImageVersion,
}
SIGCBLMarinerV2Gen2FIPSImageConfigTemplate = SigImageConfigTemplate{
@ -696,7 +693,7 @@ var (
ResourceGroup: AKSAzureLinuxResourceGroup,
Gallery: AKSAzureLinuxGalleryName,
Definition: "V3gen2fips",
Version: FrozenAzureLinuxV3SIGImageVersion,
Version: LinuxSIGImageVersion,
}
SIGCBLMarinerV2KataImageConfigTemplate = SigImageConfigTemplate{
@ -731,7 +728,7 @@ var (
ResourceGroup: AKSAzureLinuxResourceGroup,
Gallery: AKSAzureLinuxGalleryName,
Definition: "V3gen2arm64",
Version: FrozenAzureLinuxV3SIGImageVersion,
Version: LinuxSIGImageVersion,
}
SIGCBLMarinerV2TLImageConfigTemplate = SigImageConfigTemplate{

Просмотреть файл

@ -75,7 +75,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(azurelinuxV3.ResourceGroup).To(Equal("resourcegroup"))
Expect(azurelinuxV3.Gallery).To(Equal("aksazurelinux"))
Expect(azurelinuxV3.Definition).To(Equal("V3"))
Expect(azurelinuxV3.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion))
Expect(azurelinuxV3.Version).To(Equal(LinuxSIGImageVersion))
azurelinuxV2Gen2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2]
Expect(azurelinuxV2Gen2.ResourceGroup).To(Equal("resourcegroup"))
@ -87,7 +87,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(azurelinuxV3Gen2.ResourceGroup).To(Equal("resourcegroup"))
Expect(azurelinuxV3Gen2.Gallery).To(Equal("aksazurelinux"))
Expect(azurelinuxV3Gen2.Definition).To(Equal("V3gen2"))
Expect(azurelinuxV3Gen2.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion))
Expect(azurelinuxV3Gen2.Version).To(Equal(LinuxSIGImageVersion))
Expect(len(sigConfig.SigWindowsImageConfig)).To(Equal(6))
@ -173,7 +173,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(azurelinuxV3Arm64.ResourceGroup).To(Equal("resourcegroup"))
Expect(azurelinuxV3Arm64.Gallery).To(Equal("aksazurelinux"))
Expect(azurelinuxV3Arm64.Definition).To(Equal("V3gen2arm64"))
Expect(azurelinuxV3Arm64.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion))
Expect(azurelinuxV3Arm64.Version).To(Equal(LinuxSIGImageVersion))
aksUbuntu2204TLGen2Containerd := sigConfig.SigUbuntuImageConfig[AKSUbuntuContainerd2204TLGen2]
Expect(aksUbuntu2204TLGen2Containerd.ResourceGroup).To(Equal("resourcegroup"))
@ -241,7 +241,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(azurelinuxV3FIPS.ResourceGroup).To(Equal("resourcegroup"))
Expect(azurelinuxV3FIPS.Gallery).To(Equal("aksazurelinux"))
Expect(azurelinuxV3FIPS.Definition).To(Equal("V3fips"))
Expect(azurelinuxV3FIPS.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion))
Expect(azurelinuxV3FIPS.Version).To(Equal(LinuxSIGImageVersion))
marinerV2Gen2FIPS := sigConfig.SigCBLMarinerImageConfig[AKSCBLMarinerV2Gen2FIPS]
Expect(marinerV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))
@ -259,7 +259,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(azurelinuxV3Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))
Expect(azurelinuxV3Gen2FIPS.Gallery).To(Equal("aksazurelinux"))
Expect(azurelinuxV3Gen2FIPS.Definition).To(Equal("V3gen2fips"))
Expect(azurelinuxV3Gen2FIPS.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion))
Expect(azurelinuxV3Gen2FIPS.Version).To(Equal(LinuxSIGImageVersion))
azurelinuxV2Gen2Kata := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2Kata]
Expect(azurelinuxV2Gen2Kata.ResourceGroup).To(Equal("resourcegroup"))