diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go index b858a455db5..1148d32dd66 100644 --- a/pkg/agent/datamodel/sig_config.go +++ b/pkg/agent/datamodel/sig_config.go @@ -374,6 +374,9 @@ 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" @@ -630,7 +633,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V3", - Version: LinuxSIGImageVersion, + Version: FrozenAzureLinuxV3SIGImageVersion, } SIGCBLMarinerV2Gen2ImageConfigTemplate = SigImageConfigTemplate{ @@ -651,7 +654,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V3gen2", - Version: LinuxSIGImageVersion, + Version: FrozenAzureLinuxV3SIGImageVersion, } SIGCBLMarinerV2Gen1FIPSImageConfigTemplate = SigImageConfigTemplate{ @@ -672,7 +675,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V3fips", - Version: LinuxSIGImageVersion, + Version: FrozenAzureLinuxV3SIGImageVersion, } SIGCBLMarinerV2Gen2FIPSImageConfigTemplate = SigImageConfigTemplate{ @@ -693,7 +696,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V3gen2fips", - Version: LinuxSIGImageVersion, + Version: FrozenAzureLinuxV3SIGImageVersion, } SIGCBLMarinerV2KataImageConfigTemplate = SigImageConfigTemplate{ @@ -728,7 +731,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V3gen2arm64", - Version: LinuxSIGImageVersion, + Version: FrozenAzureLinuxV3SIGImageVersion, } SIGCBLMarinerV2TLImageConfigTemplate = SigImageConfigTemplate{ diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go index f6d00dcce04..3a0b2cb4d34 100644 --- a/pkg/agent/datamodel/sig_config_test.go +++ b/pkg/agent/datamodel/sig_config_test.go @@ -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(LinuxSIGImageVersion)) + Expect(azurelinuxV3.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion)) 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(LinuxSIGImageVersion)) + Expect(azurelinuxV3Gen2.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion)) 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(LinuxSIGImageVersion)) + Expect(azurelinuxV3Arm64.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion)) 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(LinuxSIGImageVersion)) + Expect(azurelinuxV3FIPS.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion)) 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(LinuxSIGImageVersion)) + Expect(azurelinuxV3Gen2FIPS.Version).To(Equal(FrozenAzureLinuxV3SIGImageVersion)) azurelinuxV2Gen2Kata := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2Kata] Expect(azurelinuxV2Gen2Kata.ResourceGroup).To(Equal("resourcegroup"))