Fix getVMManagementTypeByIPConfigurationID()

If VM not existing in cache, force cache refresh again. If the node is not in the cache, assume the node has joined after the last cache refresh and attempt to refresh the cache. Signed-off-by: Zhecheng Li <[email protected]>
k8s-infra-cherrypick-robot · Apr 19, 2024 · 568eca2 · 568eca2
1 parent ea6a004
commit 568eca2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/pkg/provider/azure_vmss_cache.go b/pkg/provider/azure_vmss_cache.go
@@ -498,7 +498,17 @@ func (ss *ScaleSet) getVMManagementTypeByIPConfigurationID(ipConfigurationID str
 	vmName := strings.Replace(nicName, "-nic", "", 1)
 
 	cachedAvSetVMs := cached.(NonVmssUniformNodesEntry).AvSetVMNodeNames
+	if cachedAvSetVMs.Has(vmName) {
+		return ManagedByAvSet, nil
+	}
+
+	// If the node is not in the cache, assume the node has joined after the last cache refresh and attempt to refresh the cache
+	cached, err = ss.nonVmssUniformNodesCache.Get(consts.NonVmssUniformNodesKey, azcache.CacheReadTypeForceRefresh)
+	if err != nil {
+		return ManagedByUnknownVMSet, err
+	}
 
+	cachedAvSetVMs = cached.(NonVmssUniformNodesEntry).AvSetVMNodeNames
 	if cachedAvSetVMs.Has(vmName) {
 		return ManagedByAvSet, nil
 	}

diff --git a/pkg/provider/azure_vmssflex.go b/pkg/provider/azure_vmssflex.go
@@ -388,12 +388,12 @@ func (fs *FlexScaleSet) getNodeInformationByIPConfigurationID(ipConfigurationID
 	// get vmName by nic name
 	vmName, err := fs.GetVMNameByIPConfigurationName(nicResourceGroup, nicName)
 	if err != nil {
-		return "", "", "", fmt.Errorf("failed to get vm name of ip config ID %s", ipConfigurationID)
+		return "", "", "", fmt.Errorf("failed to get vm name of ip config ID %s: %w", ipConfigurationID, err)
 	}
 
 	nodeName, err := fs.getNodeNameByVMName(vmName)
 	if err != nil {
-		return "", "", "", fmt.Errorf("failed to map VM Name to NodeName: VM Name %s", vmName)
+		return "", "", "", fmt.Errorf("failed to map VM Name to NodeName: VM Name %s: %w", vmName, err)
 	}
 
 	vmssFlexName, err := fs.getNodeVmssFlexName(nodeName)

diff --git a/pkg/provider/azure_vmssflex_test.go b/pkg/provider/azure_vmssflex_test.go
@@ -799,7 +799,7 @@ func TestGetNodeNameByIPConfigurationIDVmssFlex(t *testing.T) {
 			nic:                            generateTestNic("testvm1-nic", false, network.ProvisioningStateSucceeded, fmt.Sprintf("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/%s", nonExistingNodeName)),
 			expectedNodeName:               "",
 			expectedVMSetName:              "",
-			expectedErr:                    fmt.Errorf("failed to map VM Name to NodeName: VM Name NonExistingNodeName"),
+			expectedErr:                    fmt.Errorf("failed to map VM Name to NodeName: VM Name NonExistingNodeName: %w", cloudprovider.InstanceNotFound),
 		},
 		{
 			description:                    "GetNodeNameByIPConfigurationID should return error if the ipConfigurationID is in wrong format",
@@ -832,7 +832,6 @@ func TestGetNodeNameByIPConfigurationIDVmssFlex(t *testing.T) {
 		assert.Equal(t, tc.expectedVMSetName, vmSetName)
 		assert.Equal(t, tc.expectedErr, err)
 	}
-
 }
 
 func TestGetNodeCIDRMasksByProviderIDVmssFlex(t *testing.T) {