Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.28] Fix getVMManagementTypeByIPConfigurationID() #5971

Merged
merged 1 commit into from
Apr 22, 2024
Merged

[release-1.28] Fix getVMManagementTypeByIPConfigurationID() #5971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/provider/azure_vmss_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/provider/azure_vmssflex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions pkg/provider/azure_vmssflex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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) {
Expand Down
Loading