diff --git a/pkg/agent/datamodel/linux_sig_version.json b/pkg/agent/datamodel/linux_sig_version.json index 84176dc4e0d..0c997ddfc78 100644 --- a/pkg/agent/datamodel/linux_sig_version.json +++ b/pkg/agent/datamodel/linux_sig_version.json @@ -1,4 +1,3 @@ { - "ostype": "LinuxSIGImageVersion", "version": "202501.28.0" } diff --git a/pkg/agent/datamodel/mariner_v2_kata_gen2_tl_sig_version.json b/pkg/agent/datamodel/mariner_v2_kata_gen2_tl_sig_version.json deleted file mode 100644 index eab86abdc22..00000000000 --- a/pkg/agent/datamodel/mariner_v2_kata_gen2_tl_sig_version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "ostype": "CBLMarinerV2KataGen2TLSIGImageVersion", - "version": "2022.12.15" -} \ No newline at end of file diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go index 0671985631f..f51883666d2 100644 --- a/pkg/agent/datamodel/sig_config.go +++ b/pkg/agent/datamodel/sig_config.go @@ -380,10 +380,12 @@ const ( // DO NOT MODIFY: 1804GPUContainerd Gen1 & Gen2 pinned to the last image build as // GPU Dedicated preview image is being deprecated and image builds have stopped. - Frozen1804GPUContainerdSIGImageVersionForDeprecation string = "202501.05.0" - + Frozen1804GPUContainerdSIGImageVersionForDeprecation string = "202501.05.0" Frozen1804Gen2GPUContainerdSIGImageVersionForDeprecation string = "202501.05.0" + // DO NOT MODIFY: used for freezing MarinerV2KataGen2TL. + FrozenCBLMarinerV2KataGen2TLSIGImageVersion = "2022.12.15" + // We do not use AKS Windows image versions in AgentBaker. These fake values are only used for unit tests. Windows2019SIGImageVersion string = "17763.2019.221114" Windows2022SIGImageVersion string = "20348.2022.221114" @@ -391,36 +393,28 @@ const ( ) type sigVersion struct { - OSType string `json:"ostype"` Version string `json:"version"` } //go:embed linux_sig_version.json -var linuxVersionJSONContentsEmbedded string - -//go:embed mariner_v2_kata_gen2_tl_sig_version.json -var marinerV2KataGen2TLJSONContentsEmbedded string +var linuxSIGVersionJSONContent []byte //nolint:gochecknoglobals -var LinuxSIGImageVersion = getSIGVersionFromEmbeddedString(linuxVersionJSONContentsEmbedded) +var LinuxSIGImageVersion = mustGetSIGVersionFromJSONContent(linuxSIGVersionJSONContent) -//nolint:gochecknoglobals -var CBLMarinerV2KataGen2TLSIGImageVersion = getSIGVersionFromEmbeddedString(marinerV2KataGen2TLJSONContentsEmbedded) - -func getSIGVersionFromEmbeddedString(contents string) string { +// mustGetSIGVersionFromJSONContent returns the SIG image version from within the specified SON content string. +// This is used to populate LinuxSIGImageVersion from linux_sig_version.json. +func mustGetSIGVersionFromJSONContent(contents []byte) string { if len(contents) == 0 { - panic("SIG version is empty") + panic("linux_sig_Version.json content is empty") } - var sigImageStruct sigVersion - err := json.Unmarshal([]byte(contents), &sigImageStruct) - - if err != nil { + var v sigVersion + if err := json.Unmarshal(contents, &v); err != nil { panic(err) } - sigImageVersion := sigImageStruct.Version - return sigImageVersion + return v.Version } // SIG config Template. @@ -762,7 +756,7 @@ var ( ResourceGroup: AKSCBLMarinerResourceGroup, Gallery: AKSCBLMarinerGalleryName, Definition: "V2katagen2TL", - Version: CBLMarinerV2KataGen2TLSIGImageVersion, + Version: FrozenCBLMarinerV2KataGen2TLSIGImageVersion, } SIGWindows2019ImageConfigTemplate = SigImageConfigTemplate{ diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go index b93da250f59..4b1f499e6d2 100644 --- a/pkg/agent/datamodel/sig_config_test.go +++ b/pkg/agent/datamodel/sig_config_test.go @@ -229,7 +229,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() { Expect(marinerV2KataGen2TL.ResourceGroup).To(Equal("resourcegroup")) Expect(marinerV2KataGen2TL.Gallery).To(Equal("akscblmariner")) Expect(marinerV2KataGen2TL.Definition).To(Equal("V2katagen2TL")) - Expect(marinerV2KataGen2TL.Version).To(Equal(CBLMarinerV2KataGen2TLSIGImageVersion)) + Expect(marinerV2KataGen2TL.Version).To(Equal(FrozenCBLMarinerV2KataGen2TLSIGImageVersion)) marinerV2FIPS := sigConfig.SigCBLMarinerImageConfig[AKSCBLMarinerV2FIPS] Expect(marinerV2FIPS.ResourceGroup).To(Equal("resourcegroup"))