fix: comment on gen2 over gen1 preference

Azure · Jan 19, 2024 · 26b5717 · 26b5717
1 parent 55991d9
commit 26b5717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/providers/imagefamily/azlinux.go b/pkg/providers/imagefamily/azlinux.go
@@ -43,7 +43,7 @@ func (u AzureLinux) Name() string {
 }
 
 func (u AzureLinux) DefaultImages() []DefaultImageOutput {
-	// image provider will select these images in order, first match wins. This is why we chose to put V2Gen2 first in the defaultImages
+	// image provider will select these images in order, first match wins. This is why we chose to put Gen2 first in the defaultImages, as we prefer gen2 over gen1
 	return []DefaultImageOutput{
 		{
 			CommunityImage:   AzureLinuxGen2CommunityImage,

diff --git a/pkg/providers/imagefamily/ubuntu_2204.go b/pkg/providers/imagefamily/ubuntu_2204.go
@@ -47,23 +47,23 @@ func (u Ubuntu2204) DefaultImages() []DefaultImageOutput {
 	return []DefaultImageOutput{
 		{
 			CommunityImage:   Ubuntu2204Gen2CommunityImage,
-			PublicGalleryURL: v1alpha2.AKSUbuntuPublicGalleryURL,
+			PublicGalleryURL: AKSUbuntuPublicGalleryURL,
 			Requirements: scheduling.NewRequirements(
 				scheduling.NewRequirement(v1.LabelArchStable, v1.NodeSelectorOpIn, corev1beta1.ArchitectureAmd64),
 				scheduling.NewRequirement(v1alpha2.LabelSKUHyperVGeneration, v1.NodeSelectorOpIn, v1alpha2.HyperVGenerationV2),
 			),
 		},
 		{
 			CommunityImage:   Ubuntu2204Gen1CommunityImage,
-			PublicGalleryURL: v1alpha2.AKSUbuntuPublicGalleryURL,
+			PublicGalleryURL: AKSUbuntuPublicGalleryURL,
 			Requirements: scheduling.NewRequirements(
 				scheduling.NewRequirement(v1.LabelArchStable, v1.NodeSelectorOpIn, corev1beta1.ArchitectureAmd64),
 				scheduling.NewRequirement(v1alpha2.LabelSKUHyperVGeneration, v1.NodeSelectorOpIn, v1alpha2.HyperVGenerationV1),
 			),
 		},
 		{
 			CommunityImage:   Ubuntu2204Gen2ArmCommunityImage,
-			PublicGalleryURL: v1alpha2.AKSUbuntuPublicGalleryURL,
+			PublicGalleryURL: AKSUbuntuPublicGalleryURL,
 			Requirements: scheduling.NewRequirements(
 				scheduling.NewRequirement(v1.LabelArchStable, v1.NodeSelectorOpIn, corev1beta1.ArchitectureArm64),
 				scheduling.NewRequirement(v1alpha2.LabelSKUHyperVGeneration, v1.NodeSelectorOpIn, v1alpha2.HyperVGenerationV2),