Merge pull request #12162 from vespa-engine/andreer/backfill-bugfix-3

accept overlapping SANs - normal for rotations with multiple instances

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)
             );
         }));