diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go index 9ede3e1104f..01e98cb2be6 100644 --- a/pkg/agent/datamodel/sig_config.go +++ b/pkg/agent/datamodel/sig_config.go @@ -329,8 +329,6 @@ const ( Windows2019SIGImageVersion string = "17763.2019.221114" Windows2022SIGImageVersion string = "20348.2022.221114" Windows23H2SIGImageVersion string = "25398.2022.221114" - - FrozenAzureLinuxSIGImageVersion string = "202311.07.0" ) type sigVersion struct { @@ -537,7 +535,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2Gen2ImageConfigTemplate = SigImageConfigTemplate{ @@ -551,7 +549,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2gen2", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2Gen1FIPSImageConfigTemplate = SigImageConfigTemplate{ @@ -565,7 +563,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2fips", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2Gen2FIPSImageConfigTemplate = SigImageConfigTemplate{ @@ -579,7 +577,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2gen2fips", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2KataImageConfigTemplate = SigImageConfigTemplate{ @@ -593,7 +591,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2katagen2", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2Arm64ImageConfigTemplate = SigImageConfigTemplate{ @@ -607,7 +605,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2gen2arm64", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2TLImageConfigTemplate = SigImageConfigTemplate{ @@ -621,7 +619,7 @@ var ( ResourceGroup: AKSAzureLinuxResourceGroup, Gallery: AKSAzureLinuxGalleryName, Definition: "V2gen2TL", - Version: FrozenAzureLinuxSIGImageVersion, + Version: LinuxSIGImageVersion, } SIGCBLMarinerV2KataGen2TLImageConfigTemplate = SigImageConfigTemplate{ diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go index 47371313cc5..745a5dd3d5e 100644 --- a/pkg/agent/datamodel/sig_config_test.go +++ b/pkg/agent/datamodel/sig_config_test.go @@ -69,7 +69,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(azurelinux.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinux.Gallery).To(Equal("aksazurelinux")) Expect(azurelinux.Definition).To(Equal("V2")) - Expect(azurelinux.Version).To(Equal(FrozenAzureLinuxSIGImageVersion)) + Expect(azurelinux.Version).To(Equal(LinuxSIGImageVersion)) Expect(len(sigConfig.SigWindowsImageConfig)).To(Equal(6)) @@ -143,7 +143,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(azurelinuxV2Arm64.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinuxV2Arm64.Gallery).To(Equal("aksazurelinux")) Expect(azurelinuxV2Arm64.Definition).To(Equal("V2gen2arm64")) - Expect(azurelinuxV2Arm64.Version).To(Equal(FrozenAzureLinuxSIGImageVersion)) + Expect(azurelinuxV2Arm64.Version).To(Equal(LinuxSIGImageVersion)) aksUbuntu2204TLGen2Containerd := sigConfig.SigUbuntuImageConfig[AKSUbuntuContainerd2204TLGen2] Expect(aksUbuntu2204TLGen2Containerd.ResourceGroup).To(Equal("resourcegroup")) @@ -187,7 +187,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(azurelinuxV2Gen2TL.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinuxV2Gen2TL.Gallery).To(Equal("aksazurelinux")) Expect(azurelinuxV2Gen2TL.Definition).To(Equal("V2gen2TL")) - Expect(azurelinuxV2Gen2TL.Version).To(Equal(FrozenAzureLinuxSIGImageVersion)) + Expect(azurelinuxV2Gen2TL.Version).To(Equal(LinuxSIGImageVersion)) marinerV2KataGen2TL := sigConfig.SigCBLMarinerImageConfig[AKSCBLMarinerV2KataGen2TL] Expect(marinerV2KataGen2TL.ResourceGroup).To(Equal("resourcegroup")) @@ -205,7 +205,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(azurelinuxV2FIPS.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinuxV2FIPS.Gallery).To(Equal("aksazurelinux")) Expect(azurelinuxV2FIPS.Definition).To(Equal("V2fips")) - Expect(azurelinuxV2FIPS.Version).To(Equal(FrozenAzureLinuxSIGImageVersion)) + Expect(azurelinuxV2FIPS.Version).To(Equal(LinuxSIGImageVersion)) marinerV2Gen2FIPS := sigConfig.SigCBLMarinerImageConfig[AKSCBLMarinerV2Gen2FIPS] Expect(marinerV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup")) @@ -217,7 +217,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(azurelinuxV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup")) Expect(azurelinuxV2Gen2FIPS.Gallery).To(Equal("aksazurelinux")) Expect(azurelinuxV2Gen2FIPS.Definition).To(Equal("V2gen2fips")) - Expect(azurelinuxV2Gen2FIPS.Version).To(Equal(FrozenAzureLinuxSIGImageVersion)) + Expect(azurelinuxV2Gen2FIPS.Version).To(Equal(LinuxSIGImageVersion)) aksUbuntuMinimalContainerd2204 := sigConfig.SigUbuntuImageConfig[AKSUbuntuMinimalContainerd2204] Expect(aksUbuntuMinimalContainerd2204.ResourceGroup).To(Equal("resourcegroup"))