github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78373 from tedyu/sort-init-container

Browse Source 
Sort init container statuses using non-nested loop
This commit is contained in:
Kubernetes Prow Robot 2020-07-07 09:13:58 -07:00 committed by GitHub
commit 5afc42de95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/kubelet_pods.go
View File

@ -1616,18 +1616,17 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
statuses[container.Name] = status statuses[container.Name] = status
} }
// Sort the container statuses since clients of this interface expect the list
// of containers in a pod has a deterministic order.
if isInitContainer {
return kubetypes.SortStatusesOfInitContainers(pod, statuses)
}
var containerStatuses []v1.ContainerStatus var containerStatuses []v1.ContainerStatus
for _, status := range statuses { for _, status := range statuses {
containerStatuses = append(containerStatuses, *status) containerStatuses = append(containerStatuses, *status)
} }
// Sort the container statuses since clients of this interface expect the list
// of containers in a pod has a deterministic order.
if isInitContainer {
kubetypes.SortInitContainerStatuses(pod, containerStatuses)
} else {
sort.Sort(kubetypes.SortedContainerStatuses(containerStatuses)) sort.Sort(kubetypes.SortedContainerStatuses(containerStatuses))
}
return containerStatuses return containerStatuses
} }

11
pkg/kubelet/types/types.go
View File

@ -87,6 +87,17 @@ func SortInitContainerStatuses(p *v1.Pod, statuses []v1.ContainerStatus) {
} }
} }
func SortStatusesOfInitContainers(p *v1.Pod, statusMap map[string]*v1.ContainerStatus) []v1.ContainerStatus {
containers := p.Spec.InitContainers
statuses := []v1.ContainerStatus{}
for _, container := range containers {
if status, found := statusMap[container.Name]; found {
statuses = append(statuses, *status)
}
}
return statuses
}
// Reservation represents reserved resources for non-pod components. // Reservation represents reserved resources for non-pod components.
type Reservation struct { type Reservation struct {
// System represents resources reserved for non-kubernetes components. // System represents resources reserved for non-kubernetes components.