Provision load balancer for controller application

3 files changed, 2 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
index a5a586e1bda..fba0993f2f9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
@@ -31,9 +31,7 @@ public interface LoadBalancerService {
     /** Returns whether load balancers created by this service can forward traffic to given node and cluster type */
     default boolean canForwardTo(NodeType nodeType, ClusterSpec.Type clusterType) {
         return (nodeType == NodeType.tenant && clusterType.isContainer()) ||
-               (nodeType == NodeType.config && clusterType == ClusterSpec.Type.admin);
-               // TODO(mpolden): Allow this when controllers support provisioning their own LBs
-               // (nodeType == NodeType.controller && clusterType.isContainer());
+               nodeType.isConfigServerLike();
     }
 
     /** Load balancer protocols */
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
index bc89db94e69..b7e671a7b76 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
@@ -158,7 +158,7 @@ public class AclProvisioningTest {
 
         // Controllers and hosts all trust each other
         NodeAcl controllerAcl = controllers.get(0).acl(tester.nodeRepository().nodes().list(), tester.nodeRepository().loadBalancers());
-        assertAcls(List.of(controllers), List.of(controllerAcl));
+        assertAcls(List.of(controllers), Set.of("10.2.3.0/24", "10.4.5.0/24"), List.of(controllerAcl));
         assertEquals(Set.of(22, 4443, 443), controllerAcl.trustedPorts());
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
index db6cc1d5fa6..a3780db4789 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
@@ -18,7 +18,6 @@ import com.yahoo.vespa.hosted.provision.lb.LoadBalancerInstance;
 import com.yahoo.vespa.hosted.provision.lb.Real;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Collection;
@@ -229,7 +228,6 @@ public class LoadBalancerProvisionerTest {
         assertEquals(cluster, lbs.get().get(0).id().cluster());
     }
 
-    @Ignore // TODO: Re-enable when controller support is implemented
     @Test
     public void provision_load_balancer_controller_cluster() {
         ApplicationId controllerApp = ApplicationId.from("hosted-vespa", "controller", "default");