github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made internal-and-external-ip-same

Browse Source
This commit is contained in:
Abrar Shivani
2017-05-01 13:28:00 -07:00
parent ce4f010b01
commit c7a22a588f
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/cloudprovider/providers/vsphere/vsphere.go
View File

@@ -479,16 +479,17 @@ func getLocalIP() ([]v1.NodeAddress, error) {
var addressType v1.NodeAddressType var addressType v1.NodeAddressType
if strings.HasPrefix(i.HardwareAddr.String(), MAC_OUI_VC) || if strings.HasPrefix(i.HardwareAddr.String(), MAC_OUI_VC) ||
strings.HasPrefix(i.HardwareAddr.String(), MAC_OUI_ESX) { strings.HasPrefix(i.HardwareAddr.String(), MAC_OUI_ESX) {
addressType = v1.NodeExternalIP v1helper.AddToNodeAddresses(&addrs,
} else { v1.NodeAddress{
addressType = v1.NodeInternalIP Type: v1.NodeExternalIP,
Address: ipnet.IP.String(),
},
v1.NodeAddress{
Type: v1.NodeInternalIP,
Address: ipnet.IP.String(),
},
)
} }
v1helper.AddToNodeAddresses(&addrs,
v1.NodeAddress{
Type: addressType,
Address: ipnet.IP.String(),
},
)
glog.V(4).Infof("Find local IP address %v and set type to %v", ipnet.IP.String(), addressType) glog.V(4).Infof("Find local IP address %v and set type to %v", ipnet.IP.String(), addressType)
} }
} }
@@ -547,20 +548,19 @@ func (vs *VSphere) NodeAddresses(nodeName k8stypes.NodeName) ([]v1.NodeAddress,
// retrieve VM's ip(s) // retrieve VM's ip(s)
for _, v := range mvm.Guest.Net { for _, v := range mvm.Guest.Net {
var addressType v1.NodeAddressType
if vs.cfg.Network.PublicNetwork == v.Network { if vs.cfg.Network.PublicNetwork == v.Network {
addressType = v1.NodeExternalIP for _, ip := range v.IpAddress {
} else { if net.ParseIP(ip).To4() != nil {
addressType = v1.NodeInternalIP v1helper.AddToNodeAddresses(&addrs,
} v1.NodeAddress{
for _, ip := range v.IpAddress { Type: v1.NodeExternalIP,
if net.ParseIP(ip).To4() != nil { Address: ip,
v1helper.AddToNodeAddresses(&addrs, }, v1.NodeAddress{
v1.NodeAddress{ Type: v1.NodeInternalIP,
Type: addressType, Address: ip,
Address: ip, },
}, )
) }
} }
} }
} }