Update types

api/v1beta1/azuremanagedmachinepool_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	capierrors "sigs.k8s.io/cluster-api/errors"
@@ -529,7 +530,7 @@ type AzureManagedMachinePoolSpec struct {
 	// 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"`
+	SpotMaxPrice *resource.Quantity `json:"spotMaxPrice,omitempty"`
 
 	// KubeletConfig specifies the kubelet configurations for nodes.
 	// Immutable.

azure/services/agentpools/spec.go

@@ -19,6 +19,7 @@ package agentpools
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2022-03-01/containerservice"
@@ -133,7 +134,7 @@ type AgentPoolSpec struct {
 	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"`
+	SpotMaxPrice *resource.Quantity `json:"spotMaxPrice,omitempty"`
 
 	// KubeletConfig specifies the kubelet configurations for nodes.
 	KubeletConfig *KubeletConfig `json:"kubeletConfig,omitempty"`
@@ -216,14 +217,17 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 				NodeLabels:          s.NodeLabels,
 				NodeTaints:          &s.NodeTaints,
 				ScaleDownMode:       containerservice.ScaleDownMode(pointer.StringDeref(s.ScaleDownMode, "")),
-				SpotMaxPrice:        s.SpotMaxPrice,
 				Tags:                converters.TagsToMap(s.AdditionalTags),
 			},
 		}
 		if len(*normalizedProfile.NodeTaints) == 0 {
 			normalizedProfile.NodeTaints = nil
 		}
 
+		if s.SpotMaxPrice != nil {
+			normalizedProfile.SpotMaxPrice = pointer.Float64(s.SpotMaxPrice.AsApproximateFloat64())
+		}
+
 		if s.KubeletConfig != nil {
 			normalizedProfile.KubeletConfig = &containerservice.KubeletConfig{
 				CPUManagerPolicy:      s.KubeletConfig.CPUManagerPolicy,
@@ -365,7 +369,6 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 			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,
@@ -376,6 +379,10 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 		},
 	}
 
+	if s.SpotMaxPrice != nil {
+		agentPool.SpotMaxPrice = pointer.Float64(s.SpotMaxPrice.AsApproximateFloat64())
+	}
+
 	return agentPool, nil
 }
 

azure/services/agentpools/spec_test.go

@@ -18,6 +18,7 @@ package agentpools
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"reflect"
 	"testing"
 	"time"
@@ -76,6 +77,13 @@ func withAutoscaling(enabled bool) func(*AgentPoolSpec) {
 	}
 }
 
+func withSpotMaxPrice(spotMaxPrice string) func(*AgentPoolSpec) {
+	quantity := resource.MustParse(spotMaxPrice)
+	return func(pool *AgentPoolSpec) {
+		pool.SpotMaxPrice = &quantity
+	}
+}
+
 func sdkFakeAgentPool(changes ...func(*containerservice.AgentPool)) containerservice.AgentPool {
 	pool := containerservice.AgentPool{
 		ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
@@ -241,12 +249,25 @@ func TestParameters(t *testing.T) {
 			name: "parameters with an existing agent pool and update needed on spot max price",
 			spec: fakeAgentPool(),
 			existing: sdkFakeAgentPool(
-				sdkWithSpotMaxPrice(120),
+				sdkWithSpotMaxPrice(123.456),
 				sdkWithProvisioningState("Succeeded"),
 			),
 			expected:      sdkFakeAgentPool(),
 			expectedError: nil,
 		},
+		{
+			name: "parameters with an existing agent pool and update needed on spot max price",
+			spec: fakeAgentPool(
+				withSpotMaxPrice("789.123"),
+			),
+			existing: sdkFakeAgentPool(
+				sdkWithProvisioningState("Succeeded"),
+			),
+			expected: sdkFakeAgentPool(
+				sdkWithSpotMaxPrice(789.123),
+			),
+			expectedError: nil,
+		},
 		{
 			name: "parameters with an existing agent pool and update needed on max count",
 			spec: fakeAgentPool(),

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

@@ -528,9 +528,14 @@ spec:
                 description: SKU is the size of the VMs in the node pool. Immutable.
                 type: string
               spotMaxPrice:
+                anyOf:
+                - type: integer
+                - type: string
                 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.
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
               subnetName:
                 description: SubnetName specifies the Subnet where the MachinePool
                   will be placed Immutable.