fix: Only check pod phase in isPodReady (#1127)

The implementation of `isPodReady`doesn't work, when there are
init containers that are sidecars. They stay in `state=running` and
currently this will always make `isPodReady` return false.

This fixes determining readiness of pod containers. If a sidecar container 
is added to the `initContainers` of a pod, the status check must check a 
`Running` state and not a `Terminated` state.

The `podIsReady` function is rewritten to make use of the container status 
conditions. If a condition exists with `Type=Ready` and `Status=True`, it is 
considered ready. This removes the investigation of container status for that
purpose.

Author: eikek

internal/controller/status.go

@@ -21,10 +21,17 @@ func containerCounts(pod *v1.Pod) (amaltheadevv1alpha1.ContainerCounts, amalthea
 	if pod == nil {
 		return initCounts, counts
 	}
+
 	for _, container := range pod.Status.InitContainerStatuses {
-		containerCompleted := container.State.Terminated != nil && container.State.Terminated.ExitCode == 0 && container.State.Terminated.Reason == "Completed"
+		var containerOk bool
+		if isContainerSidecar(container, *pod) {
+			containerOk = container.Ready && container.State.Running != nil
+		} else {
+			containerOk = container.State.Terminated != nil && container.State.Terminated.ExitCode == 0 && container.State.Terminated.Reason == "Completed"
+		}
+
 		initCounts.Total += 1
-		if containerCompleted {
+		if containerOk {
 			initCounts.Ready += 1
 		}
 	}
@@ -39,14 +46,38 @@ func containerCounts(pod *v1.Pod) (amaltheadevv1alpha1.ContainerCounts, amalthea
 	return initCounts, counts
 }
 
+func containerRestartPolicy(status v1.ContainerStatus, pod v1.Pod) *v1.ContainerRestartPolicy {
+	for _, c := range pod.Spec.Containers {
+		if c.Name == status.Name {
+			return c.RestartPolicy
+		}
+	}
+	return nil
+}
+
+func isContainerSidecar(status v1.ContainerStatus, pod v1.Pod) bool {
+	restartPolicy := containerRestartPolicy(status, pod)
+	if restartPolicy != nil {
+		switch *restartPolicy {
+		case v1.ContainerRestartPolicyAlways:
+			return true
+		}
+	}
+	return false
+}
+
 func podIsReady(pod *v1.Pod) bool {
 	if pod == nil || pod.GetDeletionTimestamp() != nil {
-		// A missing pod or a pod being deleted is not considered ready
 		return false
 	}
 	phaseOk := pod.Status.Phase == v1.PodSucceeded || pod.Status.Phase == v1.PodRunning
-	initCounts, counts := containerCounts(pod)
-	return initCounts.Ok() && counts.Ok() && phaseOk
+	condOk := false
+	for _, c := range pod.Status.Conditions {
+		if c.Type == v1.PodReady && c.Status == v1.ConditionTrue {
+			condOk = true
+		}
+	}
+	return phaseOk && condOk
 }
 
 func podIsCompleted(pod *v1.Pod) bool {