Merge pull request #276 from replicatedhq/divolgin/panic

divolgin · web-flow · commit 09dc6b5862eb · 2020-10-05T17:27:04.000-07:00
Don't panic when pod is in a waiting state
diff --git a/pkg/collect/run.go b/pkg/collect/run.go
@@ -90,7 +90,7 @@ func runWithoutTimeout(ctx context.Context, c *Collector, pod *corev1.Pod, runCo
 		}
 		if status.Status.Phase == corev1.PodPending {
 			for _, v := range status.Status.ContainerStatuses {
-				if v.State.Waiting.Reason == "ImagePullBackOff" {
+				if v.State.Waiting != nil && v.State.Waiting.Reason == "ImagePullBackOff" {
 					return nil, errors.Errorf("run pod aborted after getting pod status 'ImagePullBackOff'")
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func runWithoutTimeout(ctx context.Context, c Collector, pod corev1.Pod, runCo`
`90`	`90`	`}`
`91`	`91`	`if status.Status.Phase == corev1.PodPending {`
`92`	`92`	`for _, v := range status.Status.ContainerStatuses {`
`93`		`- if v.State.Waiting.Reason == "ImagePullBackOff" {`
	`93`	`+ if v.State.Waiting != nil && v.State.Waiting.Reason == "ImagePullBackOff" {`
`94`	`94`	`return nil, errors.Errorf("run pod aborted after getting pod status 'ImagePullBackOff'")`
`95`	`95`	`}`
`96`	`96`	`}`