Merge pull request #292 from tremes/my-master

Update initial waiting times and give TestIsIOHealthy more time
openshift · Dec 8, 2020 · 715c26f · 715c26f
2 parents dd939db + 3560748
commit 715c26f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ test-unit:
 .PHONY: test-unit
 
 test-e2e:
-	go test ./test/integration -v -run ^\(TestIsIOHealthy\)$$ ^\(TestPullSecretExists\)$$ -timeout 1m
+	go test ./test/integration -v -run ^\(TestIsIOHealthy\)$$ ^\(TestPullSecretExists\)$$ -timeout 6m30s
 	test/integration/resource_samples/apply.sh
 	go test ./test/integration -v -timeout 20m $(TEST_OPTIONS)
 .PHONY: test-e2e

diff --git a/pkg/controller/operator.go b/pkg/controller/operator.go
@@ -129,9 +129,9 @@ func (s *Support) Run(ctx context.Context, controller *controllercmd.ControllerC
 	statusReporter.AddSources(periodic.Sources()...)
 
 	// check we can read IO container status and we are not in crash loop
-	err = wait.PollImmediate(20*time.Second, wait.Jitter(s.Controller.Interval/12, 0.1), isRunning(ctx, gatherKubeConfig))
+	err = wait.PollImmediate(20*time.Second, wait.Jitter(s.Controller.Interval/24, 0.1), isRunning(ctx, gatherKubeConfig))
 	if err != nil {
-		initialDelay = wait.Jitter(s.Controller.Interval/12, 1)
+		initialDelay = wait.Jitter(s.Controller.Interval/12, 0.5)
 		klog.Infof("Unable to check insights-operator pod status. Setting initial delay to %s", initialDelay)
 	}
 	go periodic.Run(4, ctx.Done(), initialDelay)