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

copy podStatus.ContainerStatuses before sorting it

Browse Source
This commit is contained in:
Nayef Ghattas 2020-04-16 13:51:27 +02:00
parent 006d5b8539
commit ab1807f2bc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet_pods.go
View File

@ -1837,11 +1837,15 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
statuses[container.Name] = status statuses[container.Name] = status
} }
// Copy the slice before sorting it
containerStatusesCopy := make([]*kubecontainer.Status, len(podStatus.ContainerStatuses))
copy(containerStatusesCopy, podStatus.ContainerStatuses)
// Make the latest container status comes first. // Make the latest container status comes first.
sort.Sort(sort.Reverse(kubecontainer.SortContainerStatusesByCreationTime(podStatus.ContainerStatuses))) sort.Sort(sort.Reverse(kubecontainer.SortContainerStatusesByCreationTime(containerStatusesCopy)))
// Set container statuses according to the statuses seen in pod status // Set container statuses according to the statuses seen in pod status
containerSeen := map[string]int{} containerSeen := map[string]int{}
for _, cStatus := range podStatus.ContainerStatuses { for _, cStatus := range containerStatusesCopy {
cName := cStatus.Name cName := cStatus.Name
if _, ok := statuses[cName]; !ok { if _, ok := statuses[cName]; !ok {
// This would also ignore the infra container. // This would also ignore the infra container.