Use cd.vespa.oath.cloud domain for CD endpoints

3 files changed, 12 insertions, 17 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
index 1eb68c14353..80b52e0c7a4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
@@ -31,7 +31,8 @@ import static java.util.Comparator.comparing;
  */
 public class Endpoint {
 
-    private static final String OATH_DNS_SUFFIX = ".vespa.oath.cloud";
+    private static final String MAIN_OATH_DNS_SUFFIX = ".vespa.oath.cloud";
+    private static final String CD_OATH_DNS_SUFFIX = ".cd.vespa.oath.cloud";
     private static final String PUBLIC_DNS_SUFFIX = ".vespa-app.cloud";
     private static final String PUBLIC_CD_DNS_SUFFIX = ".cd.vespa-app.cloud";
 
@@ -243,18 +244,13 @@ public class Endpoint {
 
     /** Returns the DNS suffix used for endpoints in given system */
     private static String dnsSuffix(SystemName system) {
-        switch (system) {
-            case cd, main -> {
-                return OATH_DNS_SUFFIX;
-            }
-            case Public -> {
-                return PUBLIC_DNS_SUFFIX;
-            }
-            case PublicCd -> {
-                return PUBLIC_CD_DNS_SUFFIX;
-            }
+        return switch (system) {
+            case cd -> CD_OATH_DNS_SUFFIX;
+            case main -> MAIN_OATH_DNS_SUFFIX;
+            case Public -> PUBLIC_DNS_SUFFIX;
+            case PublicCd -> PUBLIC_CD_DNS_SUFFIX;
             default -> throw new IllegalArgumentException("No DNS suffix declared for system " + system);
-        }
+        };
     }
 
     /** Returns the DNS suffix used for internal names (i.e. names not exposed to tenants) in given system */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java
index a76d2eca521..ca31ceebc17 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java
@@ -126,7 +126,7 @@ public class EndpointTest {
                 Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls()).in(SystemName.main),
 
                 // Prod endpoint in CD
-                "https://cd.a1.t1.us-north-1.vespa.oath.cloud/",
+                "https://cd.a1.t1.us-north-1.cd.vespa.oath.cloud/",
                 Endpoint.of(instance1).target(cluster, prodZone).on(Port.tls()).in(SystemName.cd),
 
                 // Test endpoint in main
@@ -300,7 +300,7 @@ public class EndpointTest {
                         .routingMethod(RoutingMethod.exclusive)
                         .on(Port.tls())
                         .in(SystemName.main),
-                "cd.a2.t2.us-east-3-r.vespa.oath.cloud",
+                "cd.a2.t2.us-east-3-r.cd.vespa.oath.cloud",
                 Endpoint.of(app2)
                         .targetApplication(EndpointId.defaultId(), ClusterSpec.Id.from("qrs"),
                                            Map.of(new DeploymentId(app2.instance("i1"), ZoneId.from("prod", "us-east-3")), 1))
@@ -335,7 +335,7 @@ public class EndpointTest {
                         .routingMethod(RoutingMethod.exclusive)
                         .on(Port.tls())
                         .in(SystemName.main),
-                "https://cd.a2.t2.a.vespa.oath.cloud/",
+                "https://cd.a2.t2.a.cd.vespa.oath.cloud/",
                 Endpoint.of(app2)
                         .targetApplication(EndpointId.defaultId(), ClusterSpec.Id.from("qrs"),
                                 Map.of(new DeploymentId(app2.instance("i1"), ZoneId.from("prod", "us-east-3")), 1))
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
index 43ad01fc5c2..168a1345c39 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
@@ -18,7 +18,6 @@ import org.junit.jupiter.api.Test;
 import java.net.URI;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -155,7 +154,7 @@ public class RotationRepositoryTest {
         var application2 = tester.newDeploymentContext("tenant2", "app2", "default");
         application2.submit(applicationPackage).deploy();
         assertEquals(List.of(new RotationId("foo-1")), rotationIds(application2.instance().rotations()));
-        assertEquals("https://cd.app2.tenant2.global.vespa.oath.cloud/",
+        assertEquals("https://cd.app2.tenant2.global.cd.vespa.oath.cloud/",
                 tester.controller().routing().readDeclaredEndpointsOf(application2.instanceId()).primary().get().url().toString());
     }