diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-01-30 10:07:35 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-01-30 10:07:35 +0100 |
| commit | b918ddc39b6fa4b1283781beb1e403f1773346f4 (patch) | |
| tree | 9b930945aabe31935446a7ff62d385d3edb589c9 /controller-server | |
| parent | baa82439e2e85ba09b8740dc54991e33b819f440 (diff) | |
Fix load balancer DNS alias
Diffstat (limited to 'controller-server')
2 files changed, 7 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java index ce3cbddb6e1..d8b90d5aa65 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAlias.java @@ -77,8 +77,8 @@ public class LoadBalancerAlias { List<String> parts = Arrays.asList(ignorePartIfDefault(clusterId.value()), ignorePartIfDefault(applicationId.instance().value()), applicationId.application().value(), - applicationId.tenant().value(), - zoneId.value() + "." + "vespa.oath.cloud" + applicationId.tenant().value() + + "." + zoneId.value() + "." + "vespa.oath.cloud" ); return parts.stream() .filter(s -> !Strings.isNullOrEmpty((s))) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java index c0e58078f79..a331ee07239 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/LoadBalancerAliasTest.java @@ -17,13 +17,13 @@ public class LoadBalancerAliasTest { @Test public void test_endpoint_names() { ZoneId zoneId = ZoneId.from("prod", "us-north-1"); - ApplicationId withInstanceName = ApplicationId.from("tenant", "application", "instance"); - testAlias("instance--application--tenant--prod.us-north-1.vespa.oath.cloud", "default", withInstanceName, zoneId); - testAlias("cluster--instance--application--tenant--prod.us-north-1.vespa.oath.cloud", "cluster", withInstanceName, zoneId); + ApplicationId withInstance = ApplicationId.from("tenant", "application", "instance"); + testAlias("instance--application--tenant.prod.us-north-1.vespa.oath.cloud", "default", withInstance, zoneId); + testAlias("cluster--instance--application--tenant.prod.us-north-1.vespa.oath.cloud", "cluster", withInstance, zoneId); ApplicationId withDefaultInstance = ApplicationId.from("tenant", "application", "default"); - testAlias("application--tenant--prod.us-north-1.vespa.oath.cloud", "default", withDefaultInstance, zoneId); - testAlias("cluster--application--tenant--prod.us-north-1.vespa.oath.cloud", "cluster", withDefaultInstance, zoneId); + testAlias("application--tenant.prod.us-north-1.vespa.oath.cloud", "default", withDefaultInstance, zoneId); + testAlias("cluster--application--tenant.prod.us-north-1.vespa.oath.cloud", "cluster", withDefaultInstance, zoneId); } private void testAlias(String expected, String clusterName, ApplicationId applicationId, ZoneId zoneId) { |