Merge pull request #16750 from vespa-engine/freva/fix-patch

Patch archive URI fixes

1 files changed, 5 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
index fe219f12af4..5dce4d7b344 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
@@ -13,8 +13,8 @@ import java.net.URI;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Updates archive URIs for tenants in all zones.
@@ -23,6 +23,8 @@ import java.util.Map;
  */
 public class ArchiveUriUpdater extends ControllerMaintainer {
 
+    private static final Set<TenantName> INFRASTRUCTURE_TENANTS = Set.of(TenantName.from("hosted-vespa"));
+
     private final ApplicationController applications;
     private final NodeRepository nodeRepository;
     private final ArchiveService archiveService;
@@ -40,7 +42,8 @@ public class ArchiveUriUpdater extends ControllerMaintainer {
         for (var application : applications.asList()) {
             for (var instance : application.instances().values()) {
                 for (var deployment : instance.deployments().values()) {
-                    tenantsByZone.computeIfAbsent(deployment.zone(), zone -> new HashSet<>())
+                    tenantsByZone
+                            .computeIfAbsent(deployment.zone(), zone -> new HashSet<>(INFRASTRUCTURE_TENANTS))
                             .add(instance.id().tenant());
                 }
             }