kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clearer image pull test and utils 

Signed-off-by: Laura Lorenz <lauralorenz@google.com>

Kubernetes-commit: 285d433dea79e6838cdd0648c36a2a82fd398179
This commit is contained in:
Laura Lorenz 2024-11-12 22:48:17 +00:00 committed by Kubernetes Publisher
parent d0bc9691f3
commit 1811ebafa9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/util/podutils/podutils.go
View File

@ -191,7 +191,10 @@ func podReadyTime(pod *corev1.Pod) *metav1.Time {
return &metav1.Time{} return &metav1.Time{}
} }
func maxContainerRestarts(pod *corev1.Pod) (regularRestarts, sidecarRestarts int) { // MaxContainerRestarts iterates through all the normal containers and sidecar
// containers in a Pod object and reports the highest restart count observed per
// category.
func MaxContainerRestarts(pod *corev1.Pod) (regularRestarts, sidecarRestarts int) {
for _, c := range pod.Status.ContainerStatuses { for _, c := range pod.Status.ContainerStatuses {
regularRestarts = max(regularRestarts, int(c.RestartCount)) regularRestarts = max(regularRestarts, int(c.RestartCount))
} }
@ -214,8 +217,8 @@ func maxContainerRestarts(pod *corev1.Pod) (regularRestarts, sidecarRestarts int
// false: pj has a higher container restart count. // false: pj has a higher container restart count.
// nil: Both have the same container restart count. // nil: Both have the same container restart count.
func compareMaxContainerRestarts(pi *corev1.Pod, pj *corev1.Pod) *bool { func compareMaxContainerRestarts(pi *corev1.Pod, pj *corev1.Pod) *bool {
regularRestartsI, sidecarRestartsI := maxContainerRestarts(pi) regularRestartsI, sidecarRestartsI := MaxContainerRestarts(pi)
regularRestartsJ, sidecarRestartsJ := maxContainerRestarts(pj) regularRestartsJ, sidecarRestartsJ := MaxContainerRestarts(pj)
if regularRestartsI != regularRestartsJ { if regularRestartsI != regularRestartsJ {
res := regularRestartsI > regularRestartsJ res := regularRestartsI > regularRestartsJ
return &res return &res