diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2020-02-18 13:40:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 13:40:48 +0100 |
| commit | 6ef61ac3746e54b419cc902e54e3a6879b2b4fd8 (patch) | |
| tree | e9ebe67b2bb4c92ca7e017bbc3a9c2aa8971bc49 /controller-server | |
| parent | ecfedd34b06e2fed8dd675214d7c26b02efa8fdd (diff) | |
| parent | ef5e42bcc2a41d54fe01dbc5d3a123b286ed9015 (diff) | |
Merge pull request #12243 from vespa-engine/andreer/use-all-zones-for-endpoint-certs
include names from all zones in endpoint certs
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java index 3d28549fa3e..d915da21603 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java @@ -174,9 +174,9 @@ public class EndpointCertificateManager { } private EndpointCertificateMetadata provisionEndpointCertificate(Instance instance) { - List<ZoneId> directlyRoutedZones = zoneRegistry.zones().directlyRouted().zones().stream().map(ZoneApi::getId).collect(Collectors.toUnmodifiableList()); + List<ZoneId> zones = zoneRegistry.zones().controllerUpgraded().zones().stream().map(ZoneApi::getId).collect(Collectors.toUnmodifiableList()); EndpointCertificateMetadata provisionedCertificateMetadata = endpointCertificateProvider - .requestCaSignedCertificate(instance.id(), dnsNamesOf(instance.id(), directlyRoutedZones)); + .requestCaSignedCertificate(instance.id(), dnsNamesOf(instance.id(), zones)); curator.writeEndpointCertificateMetadata(instance.id(), provisionedCertificateMetadata); return provisionedCertificateMetadata; } 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 50e567b2024..b082f66b70a 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 @@ -716,7 +716,7 @@ public class ControllerTest { assertEquals(Stream.concat(Stream.of("vznqtz7a5ygwjkbhhj7ymxvlrekgt4l6g.vespa.oath.cloud", "app1.tenant1.global.vespa.oath.cloud", "*.app1.tenant1.global.vespa.oath.cloud"), - tester.controller().zoneRegistry().zones().directlyRouted().ids().stream() + tester.controller().zoneRegistry().zones().controllerUpgraded().ids().stream() .flatMap(zone -> Stream.of("", "*.") .map(prefix -> prefix + "app1.tenant1." + zone.region().value() + (zone.environment() == Environment.prod ? "" : "." + zone.environment().value()) + |