github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86001 from hubv/hubv-patch-1

Browse Source 
Fix IPv6 addresses lost issue in pure ipv6 vsphere environment
This commit is contained in:
Kubernetes Prow Robot 2019-12-09 01:05:10 -08:00 committed by GitHub
commit ed8a260fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go
View File

@ -572,7 +572,7 @@ func getLocalIP() ([]v1.NodeAddress, error) {
} else { } else {
for _, addr := range localAddrs { for _, addr := range localAddrs {
if ipnet, ok := addr.(*net.IPNet); ok { if ipnet, ok := addr.(*net.IPNet); ok {
if ipnet.IP.To4() != nil { if !ipnet.IP.IsLinkLocalUnicast() {
// Filter external IP by MAC address OUIs from vCenter and from ESX // Filter external IP by MAC address OUIs from vCenter and from ESX
vmMACAddr := strings.ToLower(i.HardwareAddr.String()) vmMACAddr := strings.ToLower(i.HardwareAddr.String())
// Making sure that the MAC address is long enough // Making sure that the MAC address is long enough
@ -683,7 +683,7 @@ func (vs *VSphere) NodeAddresses(ctx context.Context, nodeName k8stypes.NodeName
for _, v := range vmMoList[0].Guest.Net { for _, v := range vmMoList[0].Guest.Net {
if vs.cfg.Network.PublicNetwork == v.Network { if vs.cfg.Network.PublicNetwork == v.Network {
for _, ip := range v.IpAddress { for _, ip := range v.IpAddress {
if net.ParseIP(ip).To4() != nil { if !net.ParseIP(ip).IsLinkLocalUnicast() {
nodehelpers.AddToNodeAddresses(&addrs, nodehelpers.AddToNodeAddresses(&addrs,
v1.NodeAddress{ v1.NodeAddress{
Type: v1.NodeExternalIP, Type: v1.NodeExternalIP,