Merge pull request #30014 from dims/remove-uname-dependency

Automatic merge from submit-queue Remove kubelet dependency on uname Let's avoid exec'ing stuff we don't have to. Related to #26093

Merge pull request #30014 from dims/remove-uname-dependency
b1f8ba9d · Kubernetes Submit Queue · GitHub · e7d01097 · 83236344 · b1f8ba9d
Commit b1f8ba9d authored Aug 04, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

node.go pkg/util/node/node.go +5 -5

No files found.
--- 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))
 }