github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27358 from lukaszo/restarts

Browse Source 
Automatic merge from submit-queue

Show restart count for init containers

Coutner is reset for normal containers.
fixes issue: #26892
This commit is contained in:
k8s-merge-robot 2016-06-29 03:22:10 -07:00 committed by GitHub
commit de0c033570
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/resource_printer.go
View File

@ -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 {
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]