Retry networking check for 10 seconds instead of just twice

Signed-off-by: Kimmo Lehto <[email protected]>
k0sproject · Jan 24, 2024 · a3d4d80 · a3d4d80
1 parent 51a07a3
commit a3d4d80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/phase/install_controllers.go b/phase/install_controllers.go
@@ -95,7 +95,9 @@ func (p *InstallControllers) Run() error {
 	err := p.parallelDo(p.hosts, func(h *cluster.Host) error {
 		if p.IsWet() || !p.leader.Metadata.DryRunFakeLeader {
 			log.Infof("%s: validating api connection to %s", h, url)
-			if err := retry.Times(context.Background(), 2, node.HTTPStatusFunc(h, healthz, 200, 401)); err != nil {
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+			if err := retry.Context(ctx, node.HTTPStatusFunc(h, healthz, 200, 401)); err != nil {
 				return fmt.Errorf("failed to connect from controller to kubernetes api at %s - check networking", url)
 			}
 		} else {

diff --git a/phase/install_workers.go b/phase/install_workers.go
@@ -104,7 +104,9 @@ func (p *InstallWorkers) Run() error {
 	err := p.parallelDo(p.hosts, func(h *cluster.Host) error {
 		if p.IsWet() || !p.leader.Metadata.DryRunFakeLeader {
 			log.Infof("%s: validating api connection to %s", h, url)
-			if err := retry.Times(context.Background(), 2, node.HTTPStatusFunc(h, healthz, 200, 401)); err != nil {
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+			if err := retry.Context(ctx, node.HTTPStatusFunc(h, healthz, 200, 401)); err != nil {
 				return fmt.Errorf("failed to connect from worker to kubernetes api at %s - check networking", url)
 			}
 		} else {