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

Kubelet tests broken on Macs with uppercase names

Browse Source 
Hostname behavior across operating systems is inconsistent (Macs can
have uppercase host names, so can some other systems).  In general,
always strings.ToLower(os.Hostname()).
This commit is contained in:
Clayton Coleman 2015-03-08 23:44:32 -04:00
parent 53ec66caf4
commit 0f87337667
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/config/config.go
View File

@ -20,6 +20,7 @@ import (
"fmt"
"os"
"reflect"
"strings"
"sync"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@ -367,5 +368,6 @@ func GeneratePodName(name string) (string, error) {
if err != nil {
return "", err
}
hostname = strings.ToLower(hostname)
return fmt.Sprintf("%s-%s", name, hostname), nil
}

2
pkg/kubelet/config/file.go
View File

@ -25,6 +25,7 @@ import (
"os"
"path/filepath"
"sort"
"strings"
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@ -172,6 +173,7 @@ func extractFromFile(filename string) (api.BoundPod, error) {
if err != nil {
return pod, err
}
hostname = strings.ToLower(hostname)
if len(pod.UID) == 0 {
hasher := md5.New()

2
pkg/kubelet/config/http_test.go
View File

@ -20,6 +20,7 @@ import (
"encoding/json"
"net/http/httptest"
"os"
"strings"
"testing"
"time"
@ -118,6 +119,7 @@ func TestExtractInvalidManifest(t *testing.T) {
func TestExtractFromHTTP(t *testing.T) {
hostname, _ := os.Hostname()
hostname = strings.ToLower(hostname)
var testCases = []struct {
desc string

2
pkg/util/node.go
View File

@ -34,5 +34,5 @@ func GetHostname(hostnameOverride string) string {
}
hostname = fqdn
}
return strings.TrimSpace(string(hostname))
return strings.ToLower(strings.TrimSpace(string(hostname)))
}