Merge pull request #5493 from k8s-infra-cherrypick-robot/cherry-pick-5481-to-release-1.18

[release-1.18] Update handling Capabilities that have a float value

Author: k8s-ci-robot

azure/services/resourceskus/sku.go

@@ -17,6 +17,7 @@ limitations under the License.
 package resourceskus
 
 import (
+	"math"
 	"strconv"
 	"strings"
 
@@ -112,10 +113,11 @@ func (s SKU) HasCapabilityWithCapacity(name string, value int64) (bool, error) {
 			continue
 		}
 
-		intVal, err := strconv.ParseInt(*capability.Value, 10, 64)
+		floatVal, err := strconv.ParseFloat(*capability.Value, 64)
 		if err != nil {
-			return false, errors.Wrapf(err, "failed to parse string '%s' as int64", *capability.Value)
+			return false, errors.Wrapf(err, "failed to parse string '%s' as float", *capability.Value)
 		}
+		intVal := int64(math.Round(floatVal))
 
 		if intVal >= value {
 			return true, nil

azure/services/scalesets/scalesets_test.go

@@ -101,6 +101,13 @@ func getResultVMSS() armcompute.VirtualMachineScaleSet {
 	return resultVMSS
 }
 
+func getMemFloatResultVMSS() armcompute.VirtualMachineScaleSet {
+	resultVMSS := newDefaultVMSS("VM_SIZE_MEM_FLOAT")
+	resultVMSS.ID = ptr.To(defaultVMSSID)
+
+	return resultVMSS
+}
+
 func TestReconcileVMSS(t *testing.T) {
 	defaultInstances := newDefaultInstances()
 	resultVMSS := newDefaultVMSS("VM_SIZE")
@@ -214,6 +221,29 @@ func TestReconcileVMSS(t *testing.T) {
 				s.ScaleSetSpec(gomockinternal.AContext()).Return(&spec).AnyTimes()
 			},
 		},
+		{
+			name:          "validate spec success: Memory is float",
+			expectedError: "",
+			expect: func(g *WithT, s *mock_scalesets.MockScaleSetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder, m *mock_scalesets.MockClientMockRecorder) {
+				s.DefaultedAzureServiceReconcileTimeout().Return(reconciler.DefaultAzureServiceReconcileTimeout)
+				spec := newVMSSSpecWithSKU(resourceskus.MemoryGB, "217.13")
+				spec.Size = "VM_SIZE_MEM_FLOAT"
+				spec.Capacity = 2
+				spec.SSHKeyData = sshKeyData
+				memFloatVMSS := newDefaultVMSS("VM_SIZE_MEM_FLOAT")
+				memFloatVMSS.ID = ptr.To(defaultVMSSID)
+
+				s.ScaleSetSpec(gomockinternal.AContext()).Return(&spec).AnyTimes()
+				m.Get(gomockinternal.AContext(), &spec).Return(memFloatVMSS, nil)
+				m.ListInstances(gomockinternal.AContext(), spec.ResourceGroup, spec.Name).Return(defaultInstances, nil)
+				fetchedMemFloatVMSS := converters.SDKToVMSS(getMemFloatResultVMSS(), defaultInstances)
+				s.ReconcileReplicas(gomockinternal.AContext(), &fetchedMemFloatVMSS).Return(nil).Times(2)
+				s.SetProviderID(azureutil.ProviderIDPrefix + defaultVMSSID).Times(2)
+				s.SetVMSSState(&fetchedMemFloatVMSS).Times(2)
+				r.CreateOrUpdateResource(gomockinternal.AContext(), &spec, serviceName).Return(getMemFloatResultVMSS(), nil)
+				s.UpdatePutStatus(infrav1.BootstrapSucceededCondition, serviceName, nil)
+			},
+		},
 		{
 			name:          "validate spec failure: failed to get SKU",
 			expectedError: "failed to get SKU INVALID_VM_SIZE in compute api: reconcile error that cannot be recovered occurred: resource sku with name 'INVALID_VM_SIZE' and category 'virtualMachines' not found in location 'test-location'. Object will not be requeued",
@@ -633,6 +663,34 @@ func getFakeSkus() []armcompute.ResourceSKU {
 				},
 			},
 		},
+		{
+			Name:         ptr.To("VM_SIZE_MEM_FLOAT"),
+			ResourceType: ptr.To(string(resourceskus.VirtualMachines)),
+			Kind:         ptr.To(string(resourceskus.VirtualMachines)),
+			Locations: []*string{
+				ptr.To("test-location"),
+			},
+			LocationInfo: []*armcompute.ResourceSKULocationInfo{
+				{
+					Location: ptr.To("test-location"),
+					Zones:    []*string{ptr.To("1"), ptr.To("3")},
+				},
+			},
+			Capabilities: []*armcompute.ResourceSKUCapabilities{
+				{
+					Name:  ptr.To(resourceskus.AcceleratedNetworking),
+					Value: ptr.To(string(resourceskus.CapabilityUnsupported)),
+				},
+				{
+					Name:  ptr.To(resourceskus.VCPUs),
+					Value: ptr.To("4"),
+				},
+				{
+					Name:  ptr.To(resourceskus.MemoryGB),
+					Value: ptr.To("217.13"),
+				},
+			},
+		},
 	}
 }
 
@@ -728,6 +786,15 @@ func newWindowsVMSSSpec() ScaleSetSpec {
 	vmss.OSDisk.OSType = azure.WindowsOS
 	return vmss
 }
+func newVMSSSpecWithSKU(capName string, capValue string) ScaleSetSpec {
+	vmsSpec := newDefaultVMSSSpec()
+	inputCapability := armcompute.ResourceSKUCapabilities{
+		Name:  ptr.To(capName),
+		Value: ptr.To(capValue),
+	}
+	vmsSpec.SKU.Capabilities = append(vmsSpec.SKU.Capabilities, &inputCapability)
+	return vmsSpec
+}
 
 func newDefaultExistingVMSS() armcompute.VirtualMachineScaleSet {
 	vmss := newDefaultVMSS("VM_SIZE")