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

gce: report the nodes external id

Browse Source 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
This commit is contained in:
Federico Simoncelli 2015-02-16 16:54:16 +00:00
parent 6b16f80dc1
commit ad6091be99
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/cloudprovider/gce/gce.go
View File

@ -279,24 +279,37 @@ func canonicalizeInstanceName(name string) string {
return name return name
} }
// IPAddress is an implementation of Instances.IPAddress. // Return the instances matching the relevant name.
func (gce *GCECloud) IPAddress(instance string) (net.IP, error) { func (gce *GCECloud) getInstanceByName(name string) (*compute.Instance, error) {
instance = canonicalizeInstanceName(instance) name = canonicalizeInstanceName(name)
res, err := gce.service.Instances.Get(gce.projectID, gce.zone, instance).Do() res, err := gce.service.Instances.Get(gce.projectID, gce.zone, name).Do()
if err != nil { if err != nil {
glog.Errorf("Failed to retrieve TargetInstance resource for instance:%s", instance) glog.Errorf("Failed to retrieve TargetInstance resource for instance:%s", name)
return nil, err return nil, err
} }
ip := net.ParseIP(res.NetworkInterfaces[0].AccessConfigs[0].NatIP) return res, nil
}
// IPAddress is an implementation of Instances.IPAddress.
func (gce *GCECloud) IPAddress(instance string) (net.IP, error) {
inst, err := gce.getInstanceByName(instance)
if err != nil {
return nil, err
}
ip := net.ParseIP(inst.NetworkInterfaces[0].AccessConfigs[0].NatIP)
if ip == nil { if ip == nil {
return nil, fmt.Errorf("invalid network IP: %s", res.NetworkInterfaces[0].AccessConfigs[0].NatIP) return nil, fmt.Errorf("invalid network IP: %s", inst.NetworkInterfaces[0].AccessConfigs[0].NatIP)
} }
return ip, nil return ip, nil
} }
// ExternalID returns the cloud provider ID of the specified instance. // ExternalID returns the cloud provider ID of the specified instance.
func (gce *GCECloud) ExternalID(instance string) (string, error) { func (gce *GCECloud) ExternalID(instance string) (string, error) {
return "", fmt.Errorf("unimplemented") inst, err := gce.getInstanceByName(instance)
if err != nil {
return "", err
}
return string(inst.Id), nil
} }
// fqdnSuffix is hacky function to compute the delta between hostame and hostname -f. // fqdnSuffix is hacky function to compute the delta between hostame and hostname -f.