Merge pull request #289 from tremes/my-master

Check context status when checking container is running OK
openshift · Dec 8, 2020 · dd939db · dd939db
2 parents 9aed455 + 4a5e0e4
commit dd939db
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/controller/operator.go b/pkg/controller/operator.go
@@ -175,6 +175,11 @@ func isRunning(ctx context.Context, config *rest.Config) wait.ConditionFunc {
 		if err != nil {
 			return false, err
 		}
+		// check if context hasn't been cancelled or done meanwhile
+		err = ctx.Err()
+		if err != nil {
+			return false, err
+		}
 		pod, err := c.Pods(os.Getenv("POD_NAMESPACE")).Get(ctx, os.Getenv("POD_NAME"), metav1.GetOptions{})
 		if err != nil {
 			if !errors.IsNotFound(err) {