From b5c6e618663847f983a57c7a8631fbfa6f14c86c Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Wed, 24 Jan 2024 09:44:26 +0200 Subject: [PATCH] Retry networking check for 30 seconds instead of just twice Signed-off-by: Kimmo Lehto --- phase/install_controllers.go | 4 +++- phase/install_workers.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/phase/install_controllers.go b/phase/install_controllers.go index 0b835d1d..74bcbf65 100644 --- 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(), 30*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 index e1f52902..970d9ec2 100644 --- 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(), 30*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 {