diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-06-15 10:37:16 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-06-15 10:50:11 +0200 |
commit | db3ead93f955ab8a7625f0d2e9941b0ee96da135 (patch) | |
tree | c7582bd83aaa9f031e5d68d14d50184b5d56a04c /controller-server | |
parent | ed3c726c11c4d728bafd199d02e6e3218f2810aa (diff) |
Stop creating legacy application endpoints names
Diffstat (limited to 'controller-server')
4 files changed, 17 insertions, 46 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index 9e0a94f3e85..c50cc6051e1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -233,7 +233,6 @@ public class RoutingController { .on(Port.tls()) .in(controller.system()); endpointDnsNames.add(endpoint.dnsName()); - if (endpoint.scope() == Scope.application) endpointDnsNames.add(endpoint.legacyRegionalDnsName()); } return Collections.unmodifiableList(endpointDnsNames); } @@ -313,8 +312,8 @@ public class RoutingController { new Record(Record.Type.CNAME, RecordName.from(endpoint.dnsName()), RecordData.fqdn(vipHostname)), Priority.normal, Optional.of(application.get().id())); - controller.nameServiceForwarder().createRecord( - new Record(Record.Type.CNAME, RecordName.from(endpoint.legacyRegionalDnsName()), RecordData.fqdn(vipHostname)), + controller.nameServiceForwarder().removeRecords( + Record.Type.CNAME, RecordName.from(endpoint.legacyRegionalDnsName()), Priority.normal, Optional.of(application.get().id())); } @@ -329,7 +328,7 @@ public class RoutingController { if (matchingTarget.isEmpty()) throw new IllegalStateException("No target found routing to " + deployment + " in " + endpoint); containerEndpoints.add(new ContainerEndpoint(clusterId.value(), asString(Endpoint.Scope.application), - List.of(endpoint.dnsName(), endpoint.legacyRegionalDnsName()), + List.of(endpoint.dnsName()), OptionalInt.of(matchingTarget.get().weight()), endpoint.routingMethod())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java index 770957b19d2..7a4d9edf66c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java @@ -309,14 +309,14 @@ public class RoutingPolicies { if ( ! aliasTargets.isEmpty()) { nameServiceForwarderIn(targetZone).createAlias( RecordName.from(applicationEndpoint.dnsName()), aliasTargets, Priority.normal, owner); - nameServiceForwarderIn(targetZone).createAlias( - RecordName.from(applicationEndpoint.legacyRegionalDnsName()), aliasTargets, Priority.normal, owner); + nameServiceForwarderIn(targetZone).removeRecords(Type.ALIAS, RecordName.from(applicationEndpoint.legacyRegionalDnsName()), + Priority.normal, owner); } if ( ! directTargets.isEmpty()) { nameServiceForwarderIn(targetZone).createDirect( RecordName.from(applicationEndpoint.dnsName()), directTargets, Priority.normal, owner); - nameServiceForwarderIn(targetZone).createDirect( - RecordName.from(applicationEndpoint.legacyRegionalDnsName()), directTargets, Priority.normal, owner); + nameServiceForwarderIn(targetZone).removeRecords(Type.DIRECT, RecordName.from(applicationEndpoint.legacyRegionalDnsName()), + Priority.normal, owner); } }); inactiveTargetsByEndpoint.forEach((applicationEndpoint, targets) -> { @@ -328,6 +328,7 @@ public class RoutingPolicies { target.data(), Priority.normal, owner); + // TODO(mpolden): Remove this and legacy name support in Endpoint after 2023-06-22 nameServiceForwarderIn(targetZone).removeRecords(target.type(), RecordName.from(applicationEndpoint.legacyRegionalDnsName()), target.data(), 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 9efdee28063..874d9468941 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 @@ -727,15 +727,15 @@ public class ControllerTest { // Expected container endpoints are passed to each deployment Map<DeploymentId, Map<List<String>, Integer>> deploymentEndpoints = Map.of( new DeploymentId(beta, east3), Map.of(), - new DeploymentId(main, east3), Map.of(List.of("e.app1.tenant1.a.vespa.oath.cloud", "e.app1.tenant1.us-east-3-r.vespa.oath.cloud"), 3), - new DeploymentId(beta, west1), Map.of(List.of("d.app1.tenant1.a.vespa.oath.cloud", "d.app1.tenant1.us-west-1-r.vespa.oath.cloud"), 3), - new DeploymentId(main, west1), Map.of(List.of("d.app1.tenant1.a.vespa.oath.cloud", "d.app1.tenant1.us-west-1-r.vespa.oath.cloud"), 7), - new DeploymentId(beta, east1a), Map.of(List.of("a.app1.tenant1.a.vespa.oath.cloud", "a.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), 2, - List.of("b.app1.tenant1.a.vespa.oath.cloud", "b.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), 1), - new DeploymentId(main, east1a), Map.of(List.of("a.app1.tenant1.a.vespa.oath.cloud", "a.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), 8, - List.of("b.app1.tenant1.a.vespa.oath.cloud", "b.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), 1), - new DeploymentId(beta, east1b), Map.of(List.of("c.app1.tenant1.a.vespa.oath.cloud", "c.app1.tenant1.aws-us-east-1b-r.vespa.oath.cloud"), 4), - new DeploymentId(main, east1b), Map.of(List.of("a.app1.tenant1.a.vespa.oath.cloud", "a.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), 1) + new DeploymentId(main, east3), Map.of(List.of("e.app1.tenant1.a.vespa.oath.cloud"), 3), + new DeploymentId(beta, west1), Map.of(List.of("d.app1.tenant1.a.vespa.oath.cloud"), 3), + new DeploymentId(main, west1), Map.of(List.of("d.app1.tenant1.a.vespa.oath.cloud"), 7), + new DeploymentId(beta, east1a), Map.of(List.of("a.app1.tenant1.a.vespa.oath.cloud"), 2, + List.of("b.app1.tenant1.a.vespa.oath.cloud"), 1), + new DeploymentId(main, east1a), Map.of(List.of("a.app1.tenant1.a.vespa.oath.cloud"), 8, + List.of("b.app1.tenant1.a.vespa.oath.cloud"), 1), + new DeploymentId(beta, east1b), Map.of(List.of("c.app1.tenant1.a.vespa.oath.cloud"), 4), + new DeploymentId(main, east1b), Map.of(List.of("a.app1.tenant1.a.vespa.oath.cloud"), 1) ); deploymentEndpoints.forEach((deployment, endpoints) -> { Set<ContainerEndpoint> expected = endpoints.entrySet().stream() @@ -787,30 +787,6 @@ public class ControllerTest { RecordData.from("vip.prod.us-west-1.")), new Record(Record.Type.CNAME, RecordName.from("e.app1.tenant1.a.vespa.oath.cloud"), - RecordData.from("vip.prod.us-east-3.")), - new Record(Record.Type.ALIAS, - RecordName.from("a.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), - RecordData.from("weighted/lb-0--tenant1.app1.beta--prod.aws-us-east-1a/dns-zone-1/prod.aws-us-east-1a/2")), - new Record(Record.Type.ALIAS, - RecordName.from("a.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), - RecordData.from("weighted/lb-0--tenant1.app1.main--prod.aws-us-east-1a/dns-zone-1/prod.aws-us-east-1a/8")), - new Record(Record.Type.ALIAS, - RecordName.from("a.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), - RecordData.from("weighted/lb-0--tenant1.app1.main--prod.aws-us-east-1b/dns-zone-1/prod.aws-us-east-1b/1")), - new Record(Record.Type.ALIAS, - RecordName.from("b.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), - RecordData.from("weighted/lb-0--tenant1.app1.beta--prod.aws-us-east-1a/dns-zone-1/prod.aws-us-east-1a/1")), - new Record(Record.Type.ALIAS, - RecordName.from("b.app1.tenant1.aws-us-east-1a-r.vespa.oath.cloud"), - RecordData.from("weighted/lb-0--tenant1.app1.main--prod.aws-us-east-1a/dns-zone-1/prod.aws-us-east-1a/1")), - new Record(Record.Type.ALIAS, - RecordName.from("c.app1.tenant1.aws-us-east-1b-r.vespa.oath.cloud"), - RecordData.from("weighted/lb-0--tenant1.app1.beta--prod.aws-us-east-1b/dns-zone-1/prod.aws-us-east-1b/4")), - new Record(Record.Type.CNAME, - RecordName.from("d.app1.tenant1.us-west-1-r.vespa.oath.cloud"), - RecordData.from("vip.prod.us-west-1.")), - new Record(Record.Type.CNAME, - RecordName.from("e.app1.tenant1.us-east-3-r.vespa.oath.cloud"), RecordData.from("vip.prod.us-east-3.")))), new TreeSet<>(records)); List<String> endpointDnsNames = tester.controller().routing().declaredEndpointsOf(context.application()) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java index 8a8500448d8..5f39507d748 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.TreeSet; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -270,11 +269,7 @@ public class EndpointCertificatesTest { "a1.t1.g.vespa-app.cloud", "*.a1.t1.g.vespa-app.cloud", "a1.t1.a.vespa-app.cloud", - "a1.t1.aws-us-west-2a.r.vespa-app.cloud", - "a1.t1.aws-us-east-1c.r.vespa-app.cloud", "*.a1.t1.a.vespa-app.cloud", - "*.a1.t1.aws-us-west-2a.r.vespa-app.cloud", - "*.a1.t1.aws-us-east-1c.r.vespa-app.cloud", "a1.t1.aws-us-east-1c.z.vespa-app.cloud", "*.a1.t1.aws-us-east-1c.z.vespa-app.cloud", "a1.t1.us-east-1.test.z.vespa-app.cloud", |