Merge pull request #62 from aifoundry-org/bug-forever-wait

Timeout waiting for control node to join tailnet

Author: deitch

pkg/cluster/cluster.go

@@ -203,6 +203,11 @@ func (c *Cluster) ensureClusterExists(ctx context.Context) (newKubeconfig []byte
 		// wait for the control plane node to be up and running
 		timeLeft := c.initWait
 		for {
+			if timeLeft <= 0 {
+				c.logger.Errorf("Control plane at %s did not respond in time, exiting", clusterAccessIP)
+				return nil, fmt.Errorf("control plane at %s did not respond in time", clusterAccessIP)
+			}
+
 			c.logger.Infof("Waiting %s for control plane node to be up and running...", timeLeft)
 			sleepTime := 30 * time.Second
 			time.Sleep(sleepTime)
@@ -247,10 +252,6 @@ func (c *Cluster) ensureClusterExists(ctx context.Context) (newKubeconfig []byte
 				c.logger.Infof("Control plane at %s is up and running", clusterAccessIP)
 				break
 			}
-			if timeLeft <= 0 {
-				c.logger.Errorf("Control plane at %s did not respond in time, exiting", clusterAccessIP)
-				return nil, fmt.Errorf("control plane at %s did not respond in time", clusterAccessIP)
-			}
 		}
 		// attach the floating IP to the control plane node, if not done already
 		if !fipAttached {