Merge pull request kubernetes#4407 from brendandburns/flaky

Return logs for failed and succeeded pods too.
sudhanshud · Feb 13, 2015 · c214022 · c214022
2 parents 4d14102 + 8b7dfc9
commit c214022
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
@@ -1423,8 +1423,11 @@ func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName, tail stri
 			return fmt.Errorf("failed to get status for pod %q - %v", podFullName, err)
 		}
 	}
-	if podStatus.Phase != api.PodRunning {
-		return fmt.Errorf("pod %q is not in 'Running' state - State: %q", podFullName, podStatus.Phase)
+	switch podStatus.Phase {
+	case api.PodRunning, api.PodSucceeded, api.PodFailed:
+		break
+	default:
+		return fmt.Errorf("pod %q is not in 'Running', 'Succeeded' or 'Failed' state - State: %q", podFullName, podStatus.Phase)
 	}
 	exists := false
 	dockerContainerID := ""