diff --git a/azure/scope/machinepool_test.go b/azure/scope/machinepool_test.go index 2b754820cf7..f62bb2c1e01 100644 --- a/azure/scope/machinepool_test.go +++ b/azure/scope/machinepool_test.go @@ -425,6 +425,11 @@ func TestMachinePoolScope_GetVMImage(t *testing.T) { Gallery: "capzed-489de9a5-a0a0-4e79-a806-ad5479ec43a5", Name: "capi-ubun2-2404", Version: "1.19.11", + Plan: &infrav1.ImagePlan{ + Publisher: "Canonical", + Offer: "ubuntu-24_04-lts", + SKU: "server-gen1", + }, }, } g.Expect(vmImage).To(Equal(image)) diff --git a/azure/services/virtualmachineimages/images.go b/azure/services/virtualmachineimages/images.go index 972ef7e0b63..f5910af9eb7 100644 --- a/azure/services/virtualmachineimages/images.go +++ b/azure/services/virtualmachineimages/images.go @@ -63,6 +63,11 @@ func (s *Service) GetDefaultLinuxImage(ctx context.Context, _, k8sVersion string Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultLinuxGalleryImageName, Version: v.String(), + Plan: &infrav1.ImagePlan{ + Publisher: "Canonical", + Offer: "ubuntu-24_04-lts", + SKU: "server-gen1", + }, }, }, nil } @@ -90,6 +95,11 @@ func (s *Service) GetDefaultWindowsImage(ctx context.Context, _, k8sVersion, run Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultWindowsGalleryImageName, Version: v.String(), + Plan: &infrav1.ImagePlan{ + Publisher: "WindowsServer", + Offer: "MicrosoftWindowsServer", + SKU: "2022-Datacenter-Core-smalldisk", + }, }, }, nil } diff --git a/azure/services/virtualmachineimages/images_test.go b/azure/services/virtualmachineimages/images_test.go index 25ad70b3126..894a1679187 100644 --- a/azure/services/virtualmachineimages/images_test.go +++ b/azure/services/virtualmachineimages/images_test.go @@ -39,6 +39,11 @@ func TestGetDefaultLinuxImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultLinuxGalleryImageName, Version: "1.31.1", + Plan: &infrav1.ImagePlan{ + Publisher: "Canonical", + Offer: "ubuntu-24_04-lts", + SKU: "server-gen1", + }, }, }, expectErr: false, @@ -50,6 +55,11 @@ func TestGetDefaultLinuxImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultLinuxGalleryImageName, Version: "1.31.0", + Plan: &infrav1.ImagePlan{ + Publisher: "Canonical", + Offer: "ubuntu-24_04-lts", + SKU: "server-gen1", + }, }, }, expectErr: false, @@ -65,6 +75,11 @@ func TestGetDefaultLinuxImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultLinuxGalleryImageName, Version: "1.31.1+1234", + Plan: &infrav1.ImagePlan{ + Publisher: "Canonical", + Offer: "ubuntu-24_04-lts", + SKU: "server-gen1", + }, }, }, expectErr: false, @@ -106,6 +121,11 @@ func TestGetDefaultWindowsImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultWindowsGalleryImageName, Version: "1.31.1", + Plan: &infrav1.ImagePlan{ + Publisher: "WindowsServer", + Offer: "MicrosoftWindowsServer", + SKU: "2022-Datacenter-Core-smalldisk", + }, }, }, expectErr: false, @@ -119,6 +139,11 @@ func TestGetDefaultWindowsImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultWindowsGalleryImageName, Version: "1.31.0", + Plan: &infrav1.ImagePlan{ + Publisher: "WindowsServer", + Offer: "MicrosoftWindowsServer", + SKU: "2022-Datacenter-Core-smalldisk", + }, }, }, expectErr: false, @@ -136,6 +161,11 @@ func TestGetDefaultWindowsImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultWindowsGalleryImageName, Version: "1.31.1+1234", + Plan: &infrav1.ImagePlan{ + Publisher: "WindowsServer", + Offer: "MicrosoftWindowsServer", + SKU: "2022-Datacenter-Core-smalldisk", + }, }, }, expectErr: false, @@ -157,6 +187,11 @@ func TestGetDefaultWindowsImage(t *testing.T) { Gallery: azure.DefaultPublicGalleryName, Name: azure.DefaultWindowsGalleryImageName, Version: "1.31.1", + Plan: &infrav1.ImagePlan{ + Publisher: "WindowsServer", + Offer: "MicrosoftWindowsServer", + SKU: "2022-Datacenter-Core-smalldisk", + }, }, }, expectErr: false,