Allow setting ScaleDownMode and SpotMaxPrice for AzureManagedMachinePool

kubernetes-sigs · Jun 27, 2023 · d9ea584 · d9ea584
1 parent 8e1c9ae
commit d9ea584
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 0 deletions.
diff --git a/api/v1beta1/azuremanagedmachinepool_types.go b/api/v1beta1/azuremanagedmachinepool_types.go
@@ -520,6 +520,17 @@ type AzureManagedMachinePoolSpec struct {
 	// +optional
 	ScaleSetPriority *string `json:"scaleSetPriority,omitempty"`
 
+	// ScaleDownMode affects the cluster autoscaler behavior. Default to Delete. Possible values include: 'Deallocate', 'Delete'
+	// +kubebuilder:validation:Enum=Deallocate;Delete
+	// +kubebuilder:default=Delete
+	// +optional
+	ScaleDownMode *string `json:"scaleDownMode,omitempty"`
+
+	// SpotMaxPrice defines max price to pay for spot instance.
+	// Possible values are any decimal value greater than zero or -1 which indicates the willingness to pay any on-demand price.
+	// +optional
+	SpotMaxPrice *float64 `json:"spotMaxPrice,omitempty"`
+
 	// KubeletConfig specifies the kubelet configurations for nodes.
 	// Immutable.
 	// +optional

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/azure/converters/managedagentpool.go b/azure/converters/managedagentpool.go
@@ -45,6 +45,8 @@ func AgentPoolToManagedClusterAgentPoolProfile(pool containerservice.AgentPool)
 		EnableNodePublicIP:   properties.EnableNodePublicIP,
 		NodePublicIPPrefixID: properties.NodePublicIPPrefixID,
 		ScaleSetPriority:     properties.ScaleSetPriority,
+		ScaleDownMode:        properties.ScaleDownMode,
+		SpotMaxPrice:         properties.SpotMaxPrice,
 		Tags:                 properties.Tags,
 		KubeletDiskType:      properties.KubeletDiskType,
 		LinuxOSConfig:        properties.LinuxOSConfig,

diff --git a/azure/scope/managedmachinepool.go b/azure/scope/managedmachinepool.go
@@ -189,6 +189,8 @@ func buildAgentPoolSpec(managedControlPlane *infrav1.AzureManagedControlPlane,
 		EnableNodePublicIP:   managedMachinePool.Spec.EnableNodePublicIP,
 		NodePublicIPPrefixID: managedMachinePool.Spec.NodePublicIPPrefixID,
 		ScaleSetPriority:     managedMachinePool.Spec.ScaleSetPriority,
+		ScaleDownMode:        managedMachinePool.Spec.ScaleDownMode,
+		SpotMaxPrice:         managedMachinePool.Spec.SpotMaxPrice,
 		AdditionalTags:       managedMachinePool.Spec.AdditionalTags,
 		KubeletDiskType:      managedMachinePool.Spec.KubeletDiskType,
 		LinuxOSConfig:        managedMachinePool.Spec.LinuxOSConfig,

diff --git a/azure/services/agentpools/spec.go b/azure/services/agentpools/spec.go
@@ -129,6 +129,12 @@ type AgentPoolSpec struct {
 	// ScaleSetPriority specifies the ScaleSetPriority for the node pool. Allowed values are 'Spot' and 'Regular'
 	ScaleSetPriority *string `json:"scaleSetPriority,omitempty"`
 
+	// ScaleDownMode affects the cluster autoscaler behavior. Allowed values are 'Deallocate' and 'Delete'
+	ScaleDownMode *string `json:"scaleDownMode,omitempty"`
+
+	// SpotMaxPrice defines max price to pay for spot instance. Allowed values are any decimal value greater than zero or -1 which indicates the willingness to pay any on-demand price.
+	SpotMaxPrice *float64 `json:"spotMaxPrice,omitempty"`
+
 	// KubeletConfig specifies the kubelet configurations for nodes.
 	KubeletConfig *KubeletConfig `json:"kubeletConfig,omitempty"`
 
@@ -193,6 +199,8 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 				NodeLabels:          existingPool.NodeLabels,
 				NodeTaints:          existingPool.NodeTaints,
 				Tags:                existingPool.Tags,
+				ScaleDownMode:       existingPool.ScaleDownMode,
+				SpotMaxPrice:        existingPool.SpotMaxPrice,
 				KubeletConfig:       existingPool.KubeletConfig,
 			},
 		}
@@ -207,6 +215,8 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 				MaxCount:            s.MaxCount,
 				NodeLabels:          s.NodeLabels,
 				NodeTaints:          &s.NodeTaints,
+				ScaleDownMode:       containerservice.ScaleDownMode(pointer.StringDeref(s.ScaleDownMode, "")),
+				SpotMaxPrice:        s.SpotMaxPrice,
 				Tags:                converters.TagsToMap(s.AdditionalTags),
 			},
 		}
@@ -354,6 +364,8 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 			OsDiskType:           containerservice.OSDiskType(pointer.StringDeref(s.OsDiskType, "")),
 			OsType:               containerservice.OSType(pointer.StringDeref(s.OSType, "")),
 			ScaleSetPriority:     containerservice.ScaleSetPriority(pointer.StringDeref(s.ScaleSetPriority, "")),
+			ScaleDownMode:        containerservice.ScaleDownMode(pointer.StringDeref(s.ScaleDownMode, "")),
+			SpotMaxPrice:         s.SpotMaxPrice,
 			Type:                 containerservice.AgentPoolTypeVirtualMachineScaleSets,
 			VMSize:               sku,
 			VnetSubnetID:         vnetSubnetID,

diff --git a/azure/services/agentpools/spec_test.go b/azure/services/agentpools/spec_test.go
@@ -114,6 +114,18 @@ func sdkWithAutoscaling(enableAutoscaling bool) func(*containerservice.AgentPool
 	}
 }
 
+func sdkWithScaleDownMode(scaleDownMode containerservice.ScaleDownMode) func(*containerservice.AgentPool) {
+	return func(pool *containerservice.AgentPool) {
+		pool.ManagedClusterAgentPoolProfileProperties.ScaleDownMode = scaleDownMode
+	}
+}
+
+func sdkWithSpotMaxPrice(spotMaxPrice float64) func(*containerservice.AgentPool) {
+	return func(pool *containerservice.AgentPool) {
+		pool.ManagedClusterAgentPoolProfileProperties.SpotMaxPrice = &spotMaxPrice
+	}
+}
+
 func sdkWithCount(count int32) func(*containerservice.AgentPool) {
 	return func(pool *containerservice.AgentPool) {
 		pool.ManagedClusterAgentPoolProfileProperties.Count = pointer.Int32(count)
@@ -215,6 +227,26 @@ func TestParameters(t *testing.T) {
 			expected:      sdkFakeAgentPool(),
 			expectedError: nil,
 		},
+		{
+			name: "parameters with an existing agent pool and update needed on scale down mode",
+			spec: fakeAgentPool(),
+			existing: sdkFakeAgentPool(
+				sdkWithScaleDownMode(containerservice.ScaleDownModeDeallocate),
+				sdkWithProvisioningState("Succeeded"),
+			),
+			expected:      sdkFakeAgentPool(),
+			expectedError: nil,
+		},
+		{
+			name: "parameters with an existing agent pool and update needed on spot max price",
+			spec: fakeAgentPool(),
+			existing: sdkFakeAgentPool(
+				sdkWithSpotMaxPrice(120),
+				sdkWithProvisioningState("Succeeded"),
+			),
+			expected:      sdkFakeAgentPool(),
+			expectedError: nil,
+		},
 		{
 			name: "parameters with an existing agent pool and update needed on max count",
 			spec: fakeAgentPool(),

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml
@@ -495,6 +495,14 @@ spec:
                 items:
                   type: string
                 type: array
+              scaleDownMode:
+                default: Delete
+                description: 'ScaleDownMode affects the cluster autoscaler behavior.
+                  Default to Delete. Possible values include: ''Deallocate'', ''Delete'''
+                enum:
+                - Deallocate
+                - Delete
+                type: string
               scaleSetPriority:
                 description: 'ScaleSetPriority specifies the ScaleSetPriority value.
                   Default to Regular. Possible values include: ''Regular'', ''Spot''
@@ -519,6 +527,10 @@ spec:
               sku:
                 description: SKU is the size of the VMs in the node pool. Immutable.
                 type: string
+              spotMaxPrice:
+                description: SpotMaxPrice defines max price to pay for spot instance.
+                  Possible values are any decimal value greater than zero or -1 which
+                  indicates the willingness to pay any on-demand price.
               subnetName:
                 description: SubnetName specifies the Subnet where the MachinePool
                   will be placed Immutable.