Merge pull request #88240 from soltysh/pod_conditions

Present more concrete information about pod readiness
This commit is contained in:
Kubernetes Prow Robot
2020-03-03 12:15:42 -08:00
committed by GitHub
2 changed files with 34 additions and 2 deletions

View File

@@ -767,7 +767,11 @@ func printPod(pod *api.Pod, options printers.GenerateOptions) ([]metav1.TableRow
// change pod status back to "Running" if there is at least one container still reporting as "Running" status
if reason == "Completed" && hasRunning {
reason = "Running"
if hasPodReadyCondition(pod.Status.Conditions) {
reason = "Running"
} else {
reason = "NotReady"
}
}
}
@@ -818,6 +822,15 @@ func printPod(pod *api.Pod, options printers.GenerateOptions) ([]metav1.TableRow
return []metav1.TableRow{row}, nil
}
func hasPodReadyCondition(conditions []api.PodCondition) bool {
for _, condition := range conditions {
if condition.Type == api.PodReady && condition.Status == api.ConditionTrue {
return true
}
}
return false
}
func printPodTemplate(obj *api.PodTemplate, options printers.GenerateOptions) ([]metav1.TableRow, error) {
row := metav1.TableRow{
Object: runtime.RawExtension{Object: obj},