diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2021-11-10 15:00:14 +0100 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2021-11-10 15:30:05 +0100 |
commit | f60df260aab56636101988591a516827f7030a73 (patch) | |
tree | cadecdb0327fedfc27b4524017e05af3e4e01454 /config-model/src | |
parent | 30cf54eb01c4957a87a4377f04cc87e6eb06e084 (diff) |
Only generate endpoints for hosted Vespa
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 4 | ||||
-rwxr-xr-x | config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 4231cc7ffe3..f8b51fdc257 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -198,8 +198,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat Create list of endpoints, these will be consumed later by the LBservicesProducer */ private void createEndpointList(DeployState deployState) { - - if( deployState.getProperties().applicationId().instance().isTester()) return; + if(!deployState.isHosted()) return; + if(deployState.getProperties().applicationId().instance().isTester()) return; List<ApplicationClusterEndpoint> endpoints = new ArrayList<>(); // Add zone local endpoints using zone dns suffixes, tenant, application and cluster id. // For now support both L7 and L4 routing diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 900aee40720..0b8cf8e29e2 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -385,6 +385,7 @@ public class ContainerClusterTest { .zone(Zone.defaultZone()) .endpoints(globalEndpoints) .properties(new TestProperties() + .setHostedVespa(true) .setApplicationId(appId) .setZoneDnsSuffixes(List.of(".endpoint.suffix"))) .build(); |