Rename AzureMachinePool template type to AzureMachinePoolMachineTemplate

azure/scope/machinepool.go

@@ -314,7 +314,7 @@ func (m *MachinePoolScope) PatchObject(ctx context.Context) error {
 
 // AzureMachineTemplate gets the Azure machine template in this scope.
 func (m *MachinePoolScope) AzureMachineTemplate(ctx context.Context) (*infrav1.AzureMachineTemplate, error) {
-	ctx, span := tele.Tracer().Start(ctx, "scope.MachinePoolScope.AzureMachineTemplate")
+	ctx, span := tele.Tracer().Start(ctx, "scope.MachinePoolScope.AzureMachinePoolMachineTemplate")
 	defer span.End()
 
 	ref := m.MachinePool.Spec.Template.Spec.InfrastructureRef

azure/scope/machinepool_test.go

@@ -54,7 +54,7 @@ func TestMachinePoolScope_Name(t *testing.T) {
 						Name: "machine-90123456",
 					},
 					Spec: infrav1exp.AzureMachinePoolSpec{
-						Template: infrav1exp.AzureMachineTemplate{
+						Template: infrav1exp.AzureMachinePoolMachineTemplate{
 							OSDisk: infrav1.OSDisk{
 								OSType: "Windows",
 							},

config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepools.yaml

@@ -97,7 +97,7 @@ spec:
                 description: RoleAssignmentName is the name of the role assignment to create for a system assigned identity. It can be any valid GUID. If not specified, a random GUID will be generated.
                 type: string
               template:
-                description: Template contains the details used to build a replica virtual machine within the Machine Pool
+                description: Template contains the details used to build a replica virtual machine within the Machine Pool.
                 properties:
                   acceleratedNetworking:
                     description: AcceleratedNetworking enables or disables Azure accelerated networking. If omitted, it will be set based on whether the requested VMSize supports accelerated networking. If AcceleratedNetworking is set to true with a VMSize that does not support it, Azure will return an error.

exp/api/v1alpha3/azuremachinepool_types.go

@@ -25,8 +25,8 @@ import (
 )
 
 type (
-	// AzureMachineTemplate defines the template for an AzureMachine.
-	AzureMachineTemplate struct {
+	// AzureMachinePoolMachineTemplate defines the template for an AzureMachinePool machine.
+	AzureMachinePoolMachineTemplate struct {
 		// VMSize is the size of the Virtual Machine to build.
 		// See https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/createorupdate#virtualmachinesizetypes
 		VMSize string `json:"vmSize"`
@@ -73,8 +73,8 @@ type (
 		// Location is the Azure region location e.g. westus2
 		Location string `json:"location"`
 
-		// Template contains the details used to build a replica virtual machine within the Machine Pool
-		Template AzureMachineTemplate `json:"template"`
+		// Template contains the details used to build a replica virtual machine within the Machine Pool.
+		Template AzureMachinePoolMachineTemplate `json:"template"`
 
 		// AdditionalTags is an optional set of tags to add to an instance, in addition to the ones added by default by the
 		// Azure provider. If both the AzureCluster and the AzureMachine specify the same tag name with different values, the

exp/api/v1alpha4/azuremachinepool_default_test.go

@@ -84,7 +84,7 @@ func createMachinePoolWithSSHPublicKey(t *testing.T, sshPublicKey string) *Azure
 func hardcodedAzureMachinePoolWithSSHKey(sshPublicKey string) *AzureMachinePool {
 	return &AzureMachinePool{
 		Spec: AzureMachinePoolSpec{
-			Template: AzureMachineTemplate{
+			Template: AzureMachinePoolMachineTemplate{
 				SSHPublicKey: sshPublicKey,
 			},
 		},

exp/api/v1alpha4/azuremachinepool_test.go

@@ -46,7 +46,7 @@ func TestAzureMachinePool_Validate(t *testing.T) {
 			Factory: func(_ *gomega.GomegaWithT) *exp.AzureMachinePool {
 				return &exp.AzureMachinePool{
 					Spec: exp.AzureMachinePoolSpec{
-						Template: exp.AzureMachineTemplate{
+						Template: exp.AzureMachinePoolMachineTemplate{
 							Image: &infrav1.Image{
 								SharedGallery: &infrav1.AzureSharedGalleryImage{
 									SubscriptionID: "foo",
@@ -69,7 +69,7 @@ func TestAzureMachinePool_Validate(t *testing.T) {
 			Factory: func(_ *gomega.GomegaWithT) *exp.AzureMachinePool {
 				return &exp.AzureMachinePool{
 					Spec: exp.AzureMachinePoolSpec{
-						Template: exp.AzureMachineTemplate{
+						Template: exp.AzureMachinePoolMachineTemplate{
 							Image: new(infrav1.Image),
 						},
 					},
@@ -85,7 +85,7 @@ func TestAzureMachinePool_Validate(t *testing.T) {
 			Factory: func(_ *gomega.GomegaWithT) *exp.AzureMachinePool {
 				return &exp.AzureMachinePool{
 					Spec: exp.AzureMachinePoolSpec{
-						Template: exp.AzureMachineTemplate{
+						Template: exp.AzureMachinePoolMachineTemplate{
 							TerminateNotificationTimeout: to.IntPtr(7),
 						},
 					},
@@ -100,7 +100,7 @@ func TestAzureMachinePool_Validate(t *testing.T) {
 			Factory: func(_ *gomega.GomegaWithT) *exp.AzureMachinePool {
 				return &exp.AzureMachinePool{
 					Spec: exp.AzureMachinePoolSpec{
-						Template: exp.AzureMachineTemplate{
+						Template: exp.AzureMachinePoolMachineTemplate{
 							TerminateNotificationTimeout: to.IntPtr(20),
 						},
 					},
@@ -116,7 +116,7 @@ func TestAzureMachinePool_Validate(t *testing.T) {
 			Factory: func(_ *gomega.GomegaWithT) *exp.AzureMachinePool {
 				return &exp.AzureMachinePool{
 					Spec: exp.AzureMachinePoolSpec{
-						Template: exp.AzureMachineTemplate{
+						Template: exp.AzureMachinePoolMachineTemplate{
 							TerminateNotificationTimeout: to.IntPtr(3),
 						},
 					},