Merge pull request #53 from StatCan/fix-upstream-error

sylus · web-flow · commit 424b2f9a336c · 2021-01-13T16:37:23.000-05:00
fix: add check for runnning notebook server
diff --git a/notebooks.go b/notebooks.go
@@ -113,7 +113,7 @@ func processStatus(notebook *kubeflowv1.Notebook, events []*corev1.Event) (Statu
 	}
 
 	// Return Container State if it's available
-	if notebook.Status.ContainerState.Running != nil {
+	if notebook.Status.ContainerState.Running != nil && notebook.Status.ReadyReplicas != 0 {
 		return StatusRunning, "Running"
 	}
 	if notebook.Status.ContainerState.Terminated != nil {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func processStatus(notebook kubeflowv1.Notebook, events []corev1.Event) (Statu`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// Return Container State if it's available`
`116`		`- if notebook.Status.ContainerState.Running != nil {`
	`116`	`+ if notebook.Status.ContainerState.Running != nil && notebook.Status.ReadyReplicas != 0 {`
`117`	`117`	`return StatusRunning, "Running"`
`118`	`118`	`}`
`119`	`119`	`if notebook.Status.ContainerState.Terminated != nil {`