chore: bump and pin CBLMariner to 202401.17.2 (#4029)

Co-authored-by: Cameron Meissner <[email protected]>
Azure · Feb 2, 2024 · 6fbbec4 · 6fbbec4
1 parent 5f2def6
commit 6fbbec4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/pkg/agent/datamodel/sig_config.go b/pkg/agent/datamodel/sig_config.go
@@ -331,6 +331,8 @@ const (
 	Windows23H2SIGImageVersion string = "25398.2022.221114"
 
 	FrozenAzureLinuxSIGImageVersion string = "202311.07.0"
+
+	FrozenCBLMarinerLinuxSIGImageVersion string = "202401.17.2"
 )
 
 type sigVersion struct {
@@ -530,7 +532,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2Gen1ImageConfigTemplate = SigImageConfigTemplate{
@@ -544,7 +546,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2gen2",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2Gen2ImageConfigTemplate = SigImageConfigTemplate{
@@ -558,7 +560,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2fips",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2Gen1FIPSImageConfigTemplate = SigImageConfigTemplate{
@@ -572,7 +574,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2gen2fips",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2Gen2FIPSImageConfigTemplate = SigImageConfigTemplate{
@@ -586,7 +588,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2katagen2",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2KataImageConfigTemplate = SigImageConfigTemplate{
@@ -600,7 +602,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2gen2arm64",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2Arm64ImageConfigTemplate = SigImageConfigTemplate{
@@ -614,7 +616,7 @@ var (
 		ResourceGroup: AKSCBLMarinerResourceGroup,
 		Gallery:       AKSCBLMarinerGalleryName,
 		Definition:    "V2gen2TL",
-		Version:       LinuxSIGImageVersion,
+		Version:       FrozenCBLMarinerLinuxSIGImageVersion,
 	}
 
 	SIGAzureLinuxV2TLImageConfigTemplate = SigImageConfigTemplate{

diff --git a/pkg/agent/datamodel/sig_config_test.go b/pkg/agent/datamodel/sig_config_test.go
@@ -137,7 +137,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
 		Expect(marinerV2Arm64.ResourceGroup).To(Equal("resourcegroup"))
 		Expect(marinerV2Arm64.Gallery).To(Equal("akscblmariner"))
 		Expect(marinerV2Arm64.Definition).To(Equal("V2gen2arm64"))
-		Expect(marinerV2Arm64.Version).To(Equal(LinuxSIGImageVersion))
+		Expect(marinerV2Arm64.Version).To(Equal(FrozenCBLMarinerLinuxSIGImageVersion))
 
 		azurelinuxV2Arm64 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Arm64Gen2]
 		Expect(azurelinuxV2Arm64.ResourceGroup).To(Equal("resourcegroup"))
@@ -181,7 +181,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
 		Expect(marinerV2Gen2TL.ResourceGroup).To(Equal("resourcegroup"))
 		Expect(marinerV2Gen2TL.Gallery).To(Equal("akscblmariner"))
 		Expect(marinerV2Gen2TL.Definition).To(Equal("V2gen2TL"))
-		Expect(marinerV2Gen2TL.Version).To(Equal(LinuxSIGImageVersion))
+		Expect(marinerV2Gen2TL.Version).To(Equal(FrozenCBLMarinerLinuxSIGImageVersion))
 
 		azurelinuxV2Gen2TL := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2TL]
 		Expect(azurelinuxV2Gen2TL.ResourceGroup).To(Equal("resourcegroup"))
@@ -199,7 +199,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
 		Expect(marinerV2FIPS.ResourceGroup).To(Equal("resourcegroup"))
 		Expect(marinerV2FIPS.Gallery).To(Equal("akscblmariner"))
 		Expect(marinerV2FIPS.Definition).To(Equal("V2fips"))
-		Expect(marinerV2FIPS.Version).To(Equal(LinuxSIGImageVersion))
+		Expect(marinerV2FIPS.Version).To(Equal(FrozenCBLMarinerLinuxSIGImageVersion))
 
 		azurelinuxV2FIPS := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2FIPS]
 		Expect(azurelinuxV2FIPS.ResourceGroup).To(Equal("resourcegroup"))
@@ -211,7 +211,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
 		Expect(marinerV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))
 		Expect(marinerV2Gen2FIPS.Gallery).To(Equal("akscblmariner"))
 		Expect(marinerV2Gen2FIPS.Definition).To(Equal("V2gen2fips"))
-		Expect(marinerV2Gen2FIPS.Version).To(Equal(LinuxSIGImageVersion))
+		Expect(marinerV2Gen2FIPS.Version).To(Equal(FrozenCBLMarinerLinuxSIGImageVersion))
 
 		azurelinuxV2Gen2FIPS := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2FIPS]
 		Expect(azurelinuxV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))