target only v1beta1

azure/scope/managedcontrolplane.go

@@ -533,13 +533,8 @@ func (s *ManagedControlPlaneScope) AgentPoolSpec() azure.AgentPoolSpec {
 		replicas = *s.MachinePool.Spec.Replicas
 	}
 
-	poolName := s.InfraMachinePool.GetName()
-	if s.InfraMachinePool.Spec.Name != nil {
-		poolName = *s.InfraMachinePool.Spec.Name
-	}
-
 	agentPoolSpec := azure.AgentPoolSpec{
-		Name:          poolName,
+		Name:          to.String(s.InfraMachinePool.Spec.Name),
 		ResourceGroup: s.ControlPlane.Spec.ResourceGroupName,
 		Cluster:       s.ControlPlane.Name,
 		SKU:           s.InfraMachinePool.Spec.SKU,

azure/scope/managedcontrolplane_test.go

@@ -149,6 +149,7 @@ func getAzureMachinePool(name string, mode infrav1.NodePoolMode) *infrav1.AzureM
 		Spec: infrav1.AzureManagedMachinePoolSpec{
 			Mode: string(mode),
 			SKU:  "Standard_D2s_v3",
+			Name: to.StringPtr(name),
 		},
 	}
 }

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

@@ -61,17 +61,6 @@ spec:
                 items:
                   type: string
                 type: array
-              scaling:
-                description: Scaling specifies the autoscaling parameters for the
-                  node pool.
-                properties:
-                  maxSize:
-                    format: int32
-                    type: integer
-                  minSize:
-                    format: int32
-                    type: integer
-                type: object
               sku:
                 description: SKU is the size of the VMs in the node pool.
                 type: string
@@ -151,17 +140,6 @@ spec:
                 items:
                   type: string
                 type: array
-              scaling:
-                description: Scaling specifies the autoscaling parameters for the
-                  node pool.
-                properties:
-                  maxSize:
-                    format: int32
-                    type: integer
-                  minSize:
-                    format: int32
-                    type: integer
-                type: object
               sku:
                 description: SKU is the size of the VMs in the node pool.
                 type: string

exp/api/v1alpha3/azuremanagedmachinepool_conversion.go

@@ -38,6 +38,7 @@ func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error { //
 	}
 
 	dst.Spec.Name = restored.Spec.Name
+	dst.Spec.Scaling = restored.Spec.Scaling
 
 	return nil
 }

exp/api/v1alpha3/azuremanagedmachinepool_types.go

@@ -37,16 +37,6 @@ type AzureManagedMachinePoolSpec struct {
 	// ProviderIDList is the unique identifier as specified by the cloud provider.
 	// +optional
 	ProviderIDList []string `json:"providerIDList,omitempty"`
-
-	// Scaling specifies the autoscaling parameters for the node pool.
-	// +optional
-	Scaling *ManagedMachinePoolScaling `json:"scaling,omitempty"`
-}
-
-// ManagedMachinePoolScaling specifies scaling options.
-type ManagedMachinePoolScaling struct {
-	MinSize *int32 `json:"minSize,omitempty"`
-	MaxSize *int32 `json:"maxSize,omitempty"`
 }
 
 // AzureManagedMachinePoolStatus defines the observed state of AzureManagedMachinePool.

exp/api/v1alpha4/azuremanagedmachinepool_conversion.go

@@ -17,20 +17,45 @@ limitations under the License.
 package v1alpha4
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	expv1beta1 "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 // ConvertTo converts this AzureManagedMachinePool to the Hub version (v1beta1).
-func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error { // nolint
+func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*expv1beta1.AzureManagedMachinePool)
 
+	if err := Convert_v1alpha4_AzureManagedMachinePool_To_v1beta1_AzureManagedMachinePool(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Manually restore data.
+	restored := &expv1beta1.AzureManagedMachinePool{}
+	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
+		return err
+	}
+	dst.Spec.Scaling = restored.Spec.Scaling
 	return Convert_v1alpha4_AzureManagedMachinePool_To_v1beta1_AzureManagedMachinePool(src, dst, nil)
 }
 
 // ConvertFrom converts from the Hub version (v1beta1) to this version.
-func (dst *AzureManagedMachinePool) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *AzureManagedMachinePool) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*expv1beta1.AzureManagedMachinePool)
 
-	return Convert_v1beta1_AzureManagedMachinePool_To_v1alpha4_AzureManagedMachinePool(src, dst, nil)
+	if err := Convert_v1beta1_AzureManagedMachinePool_To_v1alpha4_AzureManagedMachinePool(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Preserve Hub data on down-conversion.
+	if err := utilconversion.MarshalData(src, dst); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func Convert_v1beta1_AzureManagedMachinePoolSpec_To_v1alpha4_AzureManagedMachinePoolSpec(in *expv1beta1.AzureManagedMachinePoolSpec, out *AzureManagedMachinePoolSpec, s apiconversion.Scope) error {
+	return autoConvert_v1beta1_AzureManagedMachinePoolSpec_To_v1alpha4_AzureManagedMachinePoolSpec(in, out, s)
 }

exp/api/v1alpha4/azuremanagedmachinepool_types.go

@@ -56,16 +56,6 @@ type AzureManagedMachinePoolSpec struct {
 	// ProviderIDList is the unique identifier as specified by the cloud provider.
 	// +optional
 	ProviderIDList []string `json:"providerIDList,omitempty"`
-
-	// Scaling specifies the autoscaling parameters for the node pool.
-	// +optional
-	Scaling *ManagedMachinePoolScaling `json:"scaling,omitempty"`
-}
-
-// ManagedMachinePoolScaling specifies scaling options.
-type ManagedMachinePoolScaling struct {
-	MinSize *int32 `json:"minSize,omitempty"`
-	MaxSize *int32 `json:"maxSize,omitempty"`
 }
 
 // AzureManagedMachinePoolStatus defines the observed state of AzureManagedMachinePool.