Skip to content

Commit c8e4591

Browse files
djslydjsly
authored
chore: freezing all azl2 vhd versions (#7552)
1 parent 47ac6d0 commit c8e4591

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

‎pkg/agent/datamodel/sig_config.go‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,10 @@ const (
363363
// CBLMarinerV1 pinned to the last image build as Mariner 1.0 is out
364364
// of support and image builds have stopped.
365365
FrozenCBLMarinerV1SIGImageVersionForDeprecation string = "202308.28.0"
366+
367+
// DO NOT MODIFY: used for freezing MarinerV2/AzureLinuxV2, all flavors.
368+
FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion = "202512.06.0"
369+
366370
// DO NOT MODIFY: used for freezing MarinerV2KataGen2TL.
367371
FrozenCBLMarinerV2KataGen2TLSIGImageVersion = "2022.12.15"
368372

@@ -544,14 +548,14 @@ var (
544548
ResourceGroup: AKSCBLMarinerResourceGroup,
545549
Gallery: AKSCBLMarinerGalleryName,
546550
Definition: "V2",
547-
Version: LinuxSIGImageVersion,
551+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
548552
}
549553

550554
SIGAzureLinuxV2Gen1ImageConfigTemplate = SigImageConfigTemplate{
551555
ResourceGroup: AKSAzureLinuxResourceGroup,
552556
Gallery: AKSAzureLinuxGalleryName,
553557
Definition: "V2",
554-
Version: LinuxSIGImageVersion,
558+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
555559
}
556560

557561
SIGAzureLinuxV3Gen1ImageConfigTemplate = SigImageConfigTemplate{
@@ -565,14 +569,14 @@ var (
565569
ResourceGroup: AKSCBLMarinerResourceGroup,
566570
Gallery: AKSCBLMarinerGalleryName,
567571
Definition: "V2gen2",
568-
Version: LinuxSIGImageVersion,
572+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
569573
}
570574

571575
SIGAzureLinuxV2Gen2ImageConfigTemplate = SigImageConfigTemplate{
572576
ResourceGroup: AKSAzureLinuxResourceGroup,
573577
Gallery: AKSAzureLinuxGalleryName,
574578
Definition: "V2gen2",
575-
Version: LinuxSIGImageVersion,
579+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
576580
}
577581

578582
SIGAzureLinuxV3Gen2ImageConfigTemplate = SigImageConfigTemplate{
@@ -586,14 +590,14 @@ var (
586590
ResourceGroup: AKSCBLMarinerResourceGroup,
587591
Gallery: AKSCBLMarinerGalleryName,
588592
Definition: "V2fips",
589-
Version: LinuxSIGImageVersion,
593+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
590594
}
591595

592596
SIGAzureLinuxV2Gen1FIPSImageConfigTemplate = SigImageConfigTemplate{
593597
ResourceGroup: AKSAzureLinuxResourceGroup,
594598
Gallery: AKSAzureLinuxGalleryName,
595599
Definition: "V2fips",
596-
Version: LinuxSIGImageVersion,
600+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
597601
}
598602

599603
SIGAzureLinuxV3Gen1FIPSImageConfigTemplate = SigImageConfigTemplate{
@@ -607,14 +611,14 @@ var (
607611
ResourceGroup: AKSCBLMarinerResourceGroup,
608612
Gallery: AKSCBLMarinerGalleryName,
609613
Definition: "V2gen2fips",
610-
Version: LinuxSIGImageVersion,
614+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
611615
}
612616

613617
SIGAzureLinuxV2Gen2FIPSImageConfigTemplate = SigImageConfigTemplate{
614618
ResourceGroup: AKSAzureLinuxResourceGroup,
615619
Gallery: AKSAzureLinuxGalleryName,
616620
Definition: "V2gen2fips",
617-
Version: LinuxSIGImageVersion,
621+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
618622
}
619623

620624
SIGAzureLinuxV3Gen2FIPSImageConfigTemplate = SigImageConfigTemplate{
@@ -656,14 +660,14 @@ var (
656660
ResourceGroup: AKSCBLMarinerResourceGroup,
657661
Gallery: AKSCBLMarinerGalleryName,
658662
Definition: "V2gen2arm64",
659-
Version: LinuxSIGImageVersion,
663+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
660664
}
661665

662666
SIGAzureLinuxV2Arm64ImageConfigTemplate = SigImageConfigTemplate{
663667
ResourceGroup: AKSAzureLinuxResourceGroup,
664668
Gallery: AKSAzureLinuxGalleryName,
665669
Definition: "V2gen2arm64",
666-
Version: LinuxSIGImageVersion,
670+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
667671
}
668672

669673
SIGAzureLinuxV3Arm64ImageConfigTemplate = SigImageConfigTemplate{
@@ -677,14 +681,14 @@ var (
677681
ResourceGroup: AKSCBLMarinerResourceGroup,
678682
Gallery: AKSCBLMarinerGalleryName,
679683
Definition: "V2gen2TL",
680-
Version: LinuxSIGImageVersion,
684+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
681685
}
682686

683687
SIGAzureLinuxV2TLImageConfigTemplate = SigImageConfigTemplate{
684688
ResourceGroup: AKSAzureLinuxResourceGroup,
685689
Gallery: AKSAzureLinuxGalleryName,
686690
Definition: "V2gen2TL",
687-
Version: LinuxSIGImageVersion,
691+
Version: FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion,
688692
}
689693

690694
SIGAzureLinuxV3TLImageConfigTemplate = SigImageConfigTemplate{

‎pkg/agent/datamodel/sig_config_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
115115
Expect(azurelinuxV2.ResourceGroup).To(Equal("resourcegroup"))
116116
Expect(azurelinuxV2.Gallery).To(Equal("aksazurelinux"))
117117
Expect(azurelinuxV2.Definition).To(Equal("V2"))
118-
Expect(azurelinuxV2.Version).To(Equal(LinuxSIGImageVersion))
118+
Expect(azurelinuxV2.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
119119

120120
azurelinuxV3 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3]
121121
Expect(azurelinuxV3.ResourceGroup).To(Equal("resourcegroup"))
@@ -127,7 +127,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
127127
Expect(azurelinuxV2Gen2.ResourceGroup).To(Equal("resourcegroup"))
128128
Expect(azurelinuxV2Gen2.Gallery).To(Equal("aksazurelinux"))
129129
Expect(azurelinuxV2Gen2.Definition).To(Equal("V2gen2"))
130-
Expect(azurelinuxV2Gen2.Version).To(Equal(LinuxSIGImageVersion))
130+
Expect(azurelinuxV2Gen2.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
131131

132132
azurelinuxV3Gen2 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3Gen2]
133133
Expect(azurelinuxV3Gen2.ResourceGroup).To(Equal("resourcegroup"))
@@ -219,13 +219,13 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
219219
Expect(marinerV2Arm64.ResourceGroup).To(Equal("resourcegroup"))
220220
Expect(marinerV2Arm64.Gallery).To(Equal("akscblmariner"))
221221
Expect(marinerV2Arm64.Definition).To(Equal("V2gen2arm64"))
222-
Expect(marinerV2Arm64.Version).To(Equal(LinuxSIGImageVersion))
222+
Expect(marinerV2Arm64.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
223223

224224
azurelinuxV2Arm64 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Arm64Gen2]
225225
Expect(azurelinuxV2Arm64.ResourceGroup).To(Equal("resourcegroup"))
226226
Expect(azurelinuxV2Arm64.Gallery).To(Equal("aksazurelinux"))
227227
Expect(azurelinuxV2Arm64.Definition).To(Equal("V2gen2arm64"))
228-
Expect(azurelinuxV2Arm64.Version).To(Equal(LinuxSIGImageVersion))
228+
Expect(azurelinuxV2Arm64.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
229229

230230
azurelinuxV3Arm64 := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3Arm64Gen2]
231231
Expect(azurelinuxV3Arm64.ResourceGroup).To(Equal("resourcegroup"))
@@ -257,13 +257,13 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
257257
Expect(marinerV2Gen2TL.ResourceGroup).To(Equal("resourcegroup"))
258258
Expect(marinerV2Gen2TL.Gallery).To(Equal("akscblmariner"))
259259
Expect(marinerV2Gen2TL.Definition).To(Equal("V2gen2TL"))
260-
Expect(marinerV2Gen2TL.Version).To(Equal(LinuxSIGImageVersion))
260+
Expect(marinerV2Gen2TL.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
261261

262262
azurelinuxV2Gen2TL := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2TL]
263263
Expect(azurelinuxV2Gen2TL.ResourceGroup).To(Equal("resourcegroup"))
264264
Expect(azurelinuxV2Gen2TL.Gallery).To(Equal("aksazurelinux"))
265265
Expect(azurelinuxV2Gen2TL.Definition).To(Equal("V2gen2TL"))
266-
Expect(azurelinuxV2Gen2TL.Version).To(Equal(LinuxSIGImageVersion))
266+
Expect(azurelinuxV2Gen2TL.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
267267

268268
azurelinuxV3Gen2TL := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3Gen2TL]
269269
Expect(azurelinuxV3Gen2TL.ResourceGroup).To(Equal("resourcegroup"))
@@ -281,13 +281,13 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
281281
Expect(marinerV2FIPS.ResourceGroup).To(Equal("resourcegroup"))
282282
Expect(marinerV2FIPS.Gallery).To(Equal("akscblmariner"))
283283
Expect(marinerV2FIPS.Definition).To(Equal("V2fips"))
284-
Expect(marinerV2FIPS.Version).To(Equal(LinuxSIGImageVersion))
284+
Expect(marinerV2FIPS.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
285285

286286
azurelinuxV2FIPS := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2FIPS]
287287
Expect(azurelinuxV2FIPS.ResourceGroup).To(Equal("resourcegroup"))
288288
Expect(azurelinuxV2FIPS.Gallery).To(Equal("aksazurelinux"))
289289
Expect(azurelinuxV2FIPS.Definition).To(Equal("V2fips"))
290-
Expect(azurelinuxV2FIPS.Version).To(Equal(LinuxSIGImageVersion))
290+
Expect(azurelinuxV2FIPS.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
291291

292292
azurelinuxV3FIPS := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3FIPS]
293293
Expect(azurelinuxV3FIPS.ResourceGroup).To(Equal("resourcegroup"))
@@ -299,13 +299,13 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
299299
Expect(marinerV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))
300300
Expect(marinerV2Gen2FIPS.Gallery).To(Equal("akscblmariner"))
301301
Expect(marinerV2Gen2FIPS.Definition).To(Equal("V2gen2fips"))
302-
Expect(marinerV2Gen2FIPS.Version).To(Equal(LinuxSIGImageVersion))
302+
Expect(marinerV2Gen2FIPS.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
303303

304304
azurelinuxV2Gen2FIPS := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV2Gen2FIPS]
305305
Expect(azurelinuxV2Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))
306306
Expect(azurelinuxV2Gen2FIPS.Gallery).To(Equal("aksazurelinux"))
307307
Expect(azurelinuxV2Gen2FIPS.Definition).To(Equal("V2gen2fips"))
308-
Expect(azurelinuxV2Gen2FIPS.Version).To(Equal(LinuxSIGImageVersion))
308+
Expect(azurelinuxV2Gen2FIPS.Version).To(Equal(FrozenCBLMarinerV2AndAzureLinuxV2SIGImageVersion))
309309

310310
azurelinuxV3Gen2FIPS := sigConfig.SigAzureLinuxImageConfig[AKSAzureLinuxV3Gen2FIPS]
311311
Expect(azurelinuxV3Gen2FIPS.ResourceGroup).To(Equal("resourcegroup"))

0 commit comments

Comments
 (0)