github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix rkt GetPods() order

Browse Source 
Use an array to store the pod IDs and use that to build the pod array with consistent ordering,
instead of map ordering, which is random and causes test flakes.
This commit is contained in:
Andy Goldstein 2016-03-11 12:32:22 -05:00
parent 1c50f1831c
commit 7230bd1096
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/rkt/rkt.go
View File

@ -998,6 +998,7 @@ func (r *Runtime) GetPods(all bool) ([]*kubecontainer.Pod, error) {
}
pods := make(map[types.UID]*kubecontainer.Pod)
var podIDs []types.UID
for _, pod := range listResp.Pods {
pod, err := r.convertRktPod(pod)
if err != nil {
@ -1009,16 +1010,17 @@ func (r *Runtime) GetPods(all bool) ([]*kubecontainer.Pod, error) {
oldPod, found := pods[pod.ID]
if !found {
pods[pod.ID] = pod
podIDs = append(podIDs, pod.ID)
continue
}
oldPod.Containers = append(oldPod.Containers, pod.Containers...)
}
// Convert map to list.
// Convert map to list, using the consistent order from the podIDs array.
var result []*kubecontainer.Pod
for _, p := range pods {
result = append(result, p)
for _, id := range podIDs {
result = append(result, pods[id])
}
return result, nil