diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-04-01 10:46:54 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-04-01 10:46:54 +0200 |
commit | 9a0cf595146e32bc96333b5a0e39ac55f9bf6423 (patch) | |
tree | 5280028ea954f3eb52636d27c845857f29fa43c3 /controller-server | |
parent | ff20c966de85f46cb409a65b50b13a102e6e9019 (diff) |
Disable routing generator by default
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 497a0ddf5a0..351f530f623 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -788,6 +788,7 @@ public class ControllerTest { @Test public void testDeployWithRoutingGeneratorEndpoints() { + ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.DISABLE_ROUTING_GENERATOR.id(), false); var context = tester.newDeploymentContext(); var applicationPackage = new ApplicationPackageBuilder() .upgradePolicy("default") @@ -804,6 +805,7 @@ public class ControllerTest { List.of(new RoutingEndpoint("http://legacy-endpoint", "hostname", false, "upstreamName"))); } + // Defer load balancer provisioning in all environments so that routing controller uses routing generator context.deferLoadBalancerProvisioningIn(zones.stream().map(ZoneId::environment).collect(Collectors.toSet())) .submit(applicationPackage) |