mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #36841 from colemickens/colemickens-pr-azure-multiple-ipconfig
Automatic merge from submit-queue azure: support nics with multiple ipconfigs **What this PR does / why we need it**: When I initially wrote the cloudprovider, the ipconfig primary field either wasn't present or wasn't populated. Now it is and we have someone trying to use kubelet on a node with a nic with multiple ipconfigs and they ran into this. **Which issue this PR fixes**: n/a no issue filed. **Special notes for your reviewer**: **Release note**: ```release-note azure: support multiple ipconfigs on a NIC ``` If we can get this backported to 1.4.x, that would be great.
This commit is contained in:
commit
8588571eca
@ -151,9 +151,12 @@ func getPrimaryIPConfig(nic network.Interface) (*network.InterfaceIPConfiguratio
|
||||
return &((*nic.Properties.IPConfigurations)[0]), nil
|
||||
}
|
||||
|
||||
// we're here because we either have multiple ipconfigs and can't determine the primary:
|
||||
// https://github.com/Azure/azure-rest-api-specs/issues/305
|
||||
// or somehow we had zero ipconfigs
|
||||
for _, ref := range *nic.Properties.IPConfigurations {
|
||||
if *ref.Properties.Primary {
|
||||
return &ref, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("failed to determine the determine primary ipconfig. nicname=%q", *nic.Name)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user