From 832363442deed7df8c079f7ceed42532e1c09f2b Mon Sep 17 00:00:00 2001 From: bindata-mockuser Date: Wed, 3 Aug 2016 14:36:10 -0400 Subject: [PATCH] Remove kubelet dependency on uname --- pkg/util/node/node.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 5d25d7fea79..5bc2aac0387 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" "net" - "os/exec" + "os" "strings" "time" @@ -31,13 +31,13 @@ import ( ) func GetHostname(hostnameOverride string) string { - hostname := hostnameOverride - if string(hostname) == "" { - nodename, err := exec.Command("uname", "-n").Output() + var hostname string = hostnameOverride + if hostname == "" { + nodename, err := os.Hostname() if err != nil { glog.Fatalf("Couldn't determine hostname: %v", err) } - hostname = string(nodename) + hostname = nodename } return strings.ToLower(strings.TrimSpace(hostname)) }