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

Register node with nodename only.

Browse Source
This commit is contained in:
Dawn Chen 2015-04-16 16:09:09 -07:00
parent 2e702b0c61
commit 28e0c68d65
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ import (
"io/ioutil" "io/ioutil"
"net" "net"
"net/http" "net/http"
"os/exec"
"path" "path"
"strconv" "strconv"
"strings" "strings"
@ -446,26 +445,8 @@ func (gce *GCECloud) ExternalID(instance string) (string, error) {
return strconv.FormatUint(inst.Id, 10), nil return strconv.FormatUint(inst.Id, 10), nil
} }
// fqdnSuffix is hacky function to compute the delta between hostame and hostname -f.
func fqdnSuffix() (string, error) {
fullHostname, err := exec.Command("hostname", "-f").Output()
if err != nil {
return "", err
}
hostname := strings.Split(string(fullHostname), ".")[0]
return strings.TrimSpace(string(fullHostname)[len(string(hostname)):]), nil
}
// List is an implementation of Instances.List. // List is an implementation of Instances.List.
func (gce *GCECloud) List(filter string) ([]string, error) { func (gce *GCECloud) List(filter string) ([]string, error) {
// GCE gives names without their fqdn suffix, so get that here for appending.
// This is needed because the kubelet looks for its jobs in /registry/hosts/<fqdn>/pods
// We should really just replace this convention, with a negotiated naming protocol for kubelet's
// to register with the master.
suffix, err := fqdnSuffix()
if err != nil {
return []string{}, err
}
listCall := gce.service.Instances.List(gce.projectID, gce.zone) listCall := gce.service.Instances.List(gce.projectID, gce.zone)
if len(filter) > 0 { if len(filter) > 0 {
listCall = listCall.Filter("name eq " + filter) listCall = listCall.Filter("name eq " + filter)
@ -476,7 +457,7 @@ func (gce *GCECloud) List(filter string) ([]string, error) {
} }
var instances []string var instances []string
for _, instance := range res.Items { for _, instance := range res.Items {
instances = append(instances, instance.Name+suffix) instances = append(instances, instance.Name)
} }
return instances, nil return instances, nil
} }