Merge pull request #12273 from hakman/break_for_non-placeholder_ip

Fix bootstrap when at least one IP is available
kubernetes · Sep 5, 2021 · 543e9c4 · 543e9c4
2 parents 75bd1b1 + 053595a
commit 543e9c4
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go b/upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go
@@ -166,14 +166,8 @@ func (b *KopsBootstrapClient) QueryBootstrap(ctx context.Context, req *nodeup.Bo
 			return nil, fi.NewTryAgainLaterError(fmt.Sprintf("kops-controller DNS not setup yet (not found: %v)", dnsErr))
 		}
 		return nil, err
-	} else {
-		for _, ip := range ips {
-			if ip.String() != cloudup.PlaceholderIP {
-				break
-			} else {
-				return nil, fi.NewTryAgainLaterError(fmt.Sprintf("kops-controller DNS not setup yet (placeholder IP found: %v)", ips))
-			}
-		}
+	} else if len(ips) == 1 && ips[0].String() == cloudup.PlaceholderIP {
+		return nil, fi.NewTryAgainLaterError(fmt.Sprintf("kops-controller DNS not setup yet (placeholder IP found: %v)", ips))
 	}
 
 	reqBytes, err := json.Marshal(req)