Merge pull request #67922 from liggitt/vsphere-hostname

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Report Hostname node address for vsphere xref https://github.com/kubernetes/kubernetes/issues/67714 ```release-note NONE ```

Merge pull request #67922 from liggitt/vsphere-hostname
11387279 · Kubernetes Submit Queue · GitHub · cd064199 · 722e0bca · 11387279
Unverified Commit 11387279 authored Aug 28, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

vsphere.go pkg/cloudprovider/providers/vsphere/vsphere.go +7 -1

No files found.
--- a/pkg/cloudprovider/providers/vsphere/vsphere.go
+++ b/pkg/cloudprovider/providers/vsphere/vsphere.go
@@ -606,7 +606,13 @@ func (vs *VSphere) getVMFromNodeName(ctx context.Context, nodeName k8stypes.Node
 func (vs *VSphere) NodeAddresses(ctx context.Context, nodeName k8stypes.NodeName) ([]v1.NodeAddress, error) {
 	// Get local IP addresses if node is local node
 	if vs.hostName == convertToString(nodeName) {
-		return getLocalIP()
+		addrs, err := getLocalIP()
+		if err != nil {
+			return nil, err
+		}
+		// add the hostname address
+		v1helper.AddToNodeAddresses(&addrs, v1.NodeAddress{Type: v1.NodeHostName, Address: vs.hostName})
+		return addrs, nil
 	}

 	if vs.cfg == nil {