github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Make config dir handling deterministic

Browse Source
This commit is contained in:
Justin Huff 2014-06-19 15:14:57 -07:00
parent d5bf045a6c
commit ecf7d11477
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@ -27,6 +27,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"sort"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -394,6 +395,8 @@ func (kl *Kubelet) extractFromDir(name string) ([]api.ContainerManifest, error)
return manifests, err return manifests, err
} }
sort.Strings(files)
for _, file := range files { for _, file := range files {
manifest, err := kl.extractFromFile(file) manifest, err := kl.extractFromFile(file)
if err != nil { if err != nil {

6
pkg/kubelet/kubelet_test.go
View File

@ -785,8 +785,8 @@ func TestExtractFromDir(t *testing.T) {
kubelet := Kubelet{} kubelet := Kubelet{}
manifests := []api.ContainerManifest{ manifests := []api.ContainerManifest{
{Id: "foo"}, {Id: "aaaa"},
{Id: "bar"}, {Id: "bbbb"},
} }
dirName, err := ioutil.TempDir("", "foo") dirName, err := ioutil.TempDir("", "foo")
@ -795,7 +795,7 @@ func TestExtractFromDir(t *testing.T) {
for _, manifest := range manifests { for _, manifest := range manifests {
data, err := json.Marshal(manifest) data, err := json.Marshal(manifest)
expectNoError(t, err) expectNoError(t, err)
file, err := ioutil.TempFile(dirName, "kub") file, err := ioutil.TempFile(dirName, manifest.Id)
expectNoError(t, err) expectNoError(t, err)
name := file.Name() name := file.Name()
expectNoError(t, file.Close()) expectNoError(t, file.Close())