Revert "Add Plan to default images"

This reverts commit ac4408e.

Author: mboersma

azure/scope/machinepool_test.go

@@ -425,11 +425,6 @@ 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))

azure/services/virtualmachineimages/images.go

@@ -63,11 +63,6 @@ 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
 }
@@ -95,11 +90,6 @@ 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
 }

azure/services/virtualmachineimages/images_test.go

@@ -39,11 +39,6 @@ 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,
@@ -55,11 +50,6 @@ 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,
@@ -75,11 +65,6 @@ 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,
@@ -121,11 +106,6 @@ 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,
@@ -139,11 +119,6 @@ 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,
@@ -161,11 +136,6 @@ 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,
@@ -187,11 +157,6 @@ 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,