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

Merge pull request #7967 from yujuhong/uname_n

Browse Source 
Don't use the first token `uname -n` as the hostname
This commit is contained in:
Victor Marmol 2015-05-08 13:30:43 -07:00
commit 2c0a047f62
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/node.go
View File

@ -30,10 +30,7 @@ func GetHostname(hostnameOverride string) string {
if err != nil { if err != nil {
glog.Fatalf("Couldn't determine hostname: %v", err) glog.Fatalf("Couldn't determine hostname: %v", err)
} }
chunks := strings.Split(string(nodename), ".") hostname = string(nodename)
// nodename could be a fully-qualified domain name or not. Take the first
// word of nodename as the hostname for consistency.
hostname = chunks[0]
} }
return strings.ToLower(strings.TrimSpace(hostname)) return strings.ToLower(strings.TrimSpace(hostname))
} }