Skip to content

Commit ea914af

Browse files
authored
fix: redo PR 3639 (#4114)
Signed-off-by: Zach Aller <[email protected]>
1 parent 6761843 commit ea914af

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

pkg/kubectl-argo-rollouts/info/pod_info.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ func newPodInfo(pod *corev1.Pod) rollout.PodInfo {
5454
},
5555
}
5656
restarts := 0
57+
rs := make(map[string]bool, len(pod.Spec.InitContainers))
58+
for _, c := range pod.Spec.InitContainers {
59+
p := c.RestartPolicy
60+
rs[c.Name] = p != nil && *p == corev1.ContainerRestartPolicyAlways
61+
}
62+
5763
totalContainers := len(pod.Spec.Containers)
5864
readyContainers := 0
5965

@@ -70,7 +76,7 @@ func newPodInfo(pod *corev1.Pod) rollout.PodInfo {
7076
continue
7177
case container.State.Terminated != nil:
7278
// initialization is failed
73-
if len(container.State.Terminated.Reason) == 0 {
79+
if container.State.Terminated.Reason == "" {
7480
if container.State.Terminated.Signal != 0 {
7581
reason = fmt.Sprintf("Init:Signal:%d", container.State.Terminated.Signal)
7682
} else {
@@ -80,6 +86,10 @@ func newPodInfo(pod *corev1.Pod) rollout.PodInfo {
8086
reason = "Init:" + container.State.Terminated.Reason
8187
}
8288
initializing = true
89+
case rs[container.Name] && container.Started != nil && *container.Started:
90+
if container.Ready {
91+
continue
92+
}
8393
case container.State.Waiting != nil && len(container.State.Waiting.Reason) > 0 && container.State.Waiting.Reason != "PodInitializing":
8494
reason = "Init:" + container.State.Waiting.Reason
8595
initializing = true

0 commit comments

Comments
 (0)