mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
parse ipv6 address before comparison (#107736)
* parse ipv6 address before comparison Signed-off-by: Jyoti Mahapatra <jyotima@amazon.com> * use parse sloppy Signed-off-by: Jyoti Mahapatra <jyotima@amazon.com> * use parse sloppy Signed-off-by: Jyoti Mahapatra <jyotima@amazon.com> * use node address from cloudprovider as is Signed-off-by: Jyoti Mahapatra <jyotima@amazon.com>
This commit is contained in:
parent
2593f5ba17
commit
0e0abd602f
@ -126,7 +126,7 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs
|
||||
|
||||
nodeIPTypes := make(map[v1.NodeAddressType]bool)
|
||||
for _, nodeAddress := range cloudNodeAddresses {
|
||||
if nodeAddress.Address == nodeIP.String() {
|
||||
if netutils.ParseIPSloppy(nodeAddress.Address).Equal(nodeIP) {
|
||||
enforcedNodeAddresses = append(enforcedNodeAddresses, v1.NodeAddress{Type: nodeAddress.Type, Address: nodeAddress.Address})
|
||||
nodeIPTypes[nodeAddress.Type] = true
|
||||
}
|
||||
|
@ -294,6 +294,20 @@ func TestNodeAddress(t *testing.T) {
|
||||
hostnameOverride: true,
|
||||
shouldError: false,
|
||||
},
|
||||
{
|
||||
name: "Dual-stack cloud, with nodeIP, different IPv6 formats",
|
||||
nodeIP: netutils.ParseIPSloppy("2600:1f14:1d4:d101::ba3d"),
|
||||
nodeAddresses: []v1.NodeAddress{
|
||||
{Type: v1.NodeInternalIP, Address: "10.1.1.1"},
|
||||
{Type: v1.NodeInternalIP, Address: "2600:1f14:1d4:d101:0:0:0:ba3d"},
|
||||
{Type: v1.NodeHostName, Address: testKubeletHostname},
|
||||
},
|
||||
expectedAddresses: []v1.NodeAddress{
|
||||
{Type: v1.NodeInternalIP, Address: "2600:1f14:1d4:d101:0:0:0:ba3d"},
|
||||
{Type: v1.NodeHostName, Address: testKubeletHostname},
|
||||
},
|
||||
shouldError: false,
|
||||
},
|
||||
{
|
||||
name: "Dual-stack cloud, IPv4 first, no nodeIP",
|
||||
nodeAddresses: []v1.NodeAddress{
|
||||
|
Loading…
Reference in New Issue
Block a user