github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Report cloudstack hostname address

Browse Source
This commit is contained in:
Jordan Liggitt 2018-08-22 13:39:52 -04:00
parent e46203c40d
commit 7078bfed58
No known key found for this signature in database
GPG Key ID: 39928704103C7229
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/cloudstack/cloudstack_instances.go
View File

@ -69,6 +69,10 @@ func (cs *CSCloud) nodeAddresses(instance *cloudstack.VirtualMachine) ([]v1.Node
{Type: v1.NodeInternalIP, Address: instance.Nic[0].Ipaddress}, {Type: v1.NodeInternalIP, Address: instance.Nic[0].Ipaddress},
} }
if instance.Hostname != "" {
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: instance.Hostname})
}
if instance.Publicip != "" { if instance.Publicip != "" {
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeExternalIP, Address: instance.Publicip}) addresses = append(addresses, v1.NodeAddress{Type: v1.NodeExternalIP, Address: instance.Publicip})
} else { } else {

15
pkg/cloudprovider/providers/cloudstack/metadata.go
View File

@ -39,6 +39,7 @@ type metadata struct {
type metadataType string type metadataType string
const ( const (
metadataTypeHostname metadataType = "local-hostname"
metadataTypeExternalIP metadataType = "public-ipv4" metadataTypeExternalIP metadataType = "public-ipv4"
metadataTypeInternalIP metadataType = "local-ipv4" metadataTypeInternalIP metadataType = "local-ipv4"
metadataTypeInstanceID metadataType = "instance-id" metadataTypeInstanceID metadataType = "instance-id"
@ -58,10 +59,20 @@ func (m *metadata) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1
return nil, fmt.Errorf("could not get internal IP: %v", err) return nil, fmt.Errorf("could not get internal IP: %v", err)
} }
return []v1.NodeAddress{ addresses := []v1.NodeAddress{
{Type: v1.NodeExternalIP, Address: externalIP}, {Type: v1.NodeExternalIP, Address: externalIP},
{Type: v1.NodeInternalIP, Address: internalIP}, {Type: v1.NodeInternalIP, Address: internalIP},
}, nil }
hostname, err := m.get(metadataTypeHostname)
if err != nil {
return nil, fmt.Errorf("could not get hostname: %v", err)
}
if hostname != "" {
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: hostname})
}
return addresses, nil
} }
// NodeAddressesByProviderID returns the addresses of the specified instance. // NodeAddressesByProviderID returns the addresses of the specified instance.