diff options
author | Andreas Eriksen <andreer@verizonmedia.com> | 2020-02-13 10:41:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-13 10:41:44 +0100 |
commit | 4c17730107caff84c5210d9e001872b2a07b728d (patch) | |
tree | eebf1c6e22d296af9911e26b034c2870787bc1f8 /controller-server | |
parent | 74c0354105f3a00ceb4465eb7cb2aa9c1780e7ef (diff) | |
parent | 3d37798c860bd3b23c03d4e42ffce556fc937c90 (diff) |
Merge pull request #12162 from vespa-engine/andreer/backfill-bugfix-3
accept overlapping SANs - normal for rotations with multiple instances
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java | 7 |
1 files changed, 1 insertions, 6 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 071c1217b14..1bb449b0a16 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 @@ -129,12 +129,7 @@ public class EndpointCertificateManager { throw new RuntimeException("Backfill failed - provider metadata missing request_id"); if (providerMetadata.requestedDnsSans().isEmpty()) throw new RuntimeException("Backfill failed - provider metadata missing DNS SANs for " + providerMetadata.request_id().get()); - providerMetadata.requestedDnsSans().get().forEach(san -> { - var previous = sanToEndpointCertificate.put(san, providerMetadata); - if (previous != null) - throw new RuntimeException("Backfill failed - Overlapping SANs in certificates " + - providerMetadata.request_id() + " and " + previous.request_id()); - } + providerMetadata.requestedDnsSans().get().forEach(san -> sanToEndpointCertificate.put(san, providerMetadata) ); })); |