Skip to content

K
k3s
Commit de0c0335 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27358 from lukaszo/restarts

Automatic merge from submit-queue Show restart count for init containers Coutner is reset for normal containers. fixes issue: #26892
parents 1a1a4709 11e1188d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
pkg/kubectl/resource_printer.go
View file @ de0c0335
...@@ -616,6 +616,7 @@ func printPodBase(pod *api.Pod, w io.Writer, options PrintOptions) error { ...@@ -616,6 +616,7 @@ func printPodBase(pod *api.Pod, w io.Writer, options PrintOptions) error {
initializing := false initializing := false
for i := range pod.Status.InitContainerStatuses { for i := range pod.Status.InitContainerStatuses {
container := pod.Status.InitContainerStatuses[i] container := pod.Status.InitContainerStatuses[i]
restarts += int(container.RestartCount)
switch { switch {
case container.State.Terminated != nil && container.State.Terminated.ExitCode == 0: case container.State.Terminated != nil && container.State.Terminated.ExitCode == 0:
continue continue
...@@ -641,6 +642,7 @@ func printPodBase(pod *api.Pod, w io.Writer, options PrintOptions) error { ...@@ -641,6 +642,7 @@ func printPodBase(pod *api.Pod, w io.Writer, options PrintOptions) error {
break break
} }
if !initializing { if !initializing {
restarts = 0
for i := len(pod.Status.ContainerStatuses) - 1; i >= 0; i-- { for i := len(pod.Status.ContainerStatuses) - 1; i >= 0; i-- {
container := pod.Status.ContainerStatuses[i] container := pod.Status.ContainerStatuses[i]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment