Use all addresses for configuring k8s agents

sdg0919 · Apr 5, 2020 · 990a98c · 990a98c
1 parent 1a5d4af
commit 990a98c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/state/address.go b/state/address.go
@@ -298,12 +298,14 @@ func (st *State) apiHostPortsForCAAS(public bool) (addresses []network.SpaceHost
 	}
 
 	// select public address.
+	publicAddr, _ := addrs.OneMatchingScope(network.ScopeMatchPublic)
 	if public {
-		addr, _ := addrs.OneMatchingScope(network.ScopeMatchPublic)
-		return addrsToHostPorts(addr), nil
+		return addrsToHostPorts(publicAddr), nil
 	}
-	// select internal address.
-	return addrsToHostPorts(addrs.AllMatchingScope(network.ScopeMatchCloudLocal)...), nil
+
+	// TODO(wallyworld) - for now, return all addresses for agents to try, public last
+	result := addrsToHostPorts(addrs.AllMatchingScope(network.ScopeMatchCloudLocal)...)
+	return append(result, addrsToHostPorts(publicAddr)...), nil
 }
 
 // apiHostPortsForKey returns API addresses extracted from the document