Merge pull request #26705 from vespa-engine/mpolden/remove-system-restriction

Run ArtifactExpirer in all systems

1 files changed, 1 insertions, 12 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
index 0b2f8328404..32d06286820 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.CloudName;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.artifact.Artifact;
 import com.yahoo.vespa.hosted.controller.api.integration.artifact.ArtifactRegistry;
@@ -13,12 +12,9 @@ import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 /**
  * Periodically expire unused artifacts, e.g. container images and RPMs.
@@ -32,7 +28,7 @@ public class ArtifactExpirer extends ControllerMaintainer {
     private static final Duration MIN_AGE = Duration.ofDays(14);
 
     public ArtifactExpirer(Controller controller, Duration interval) {
-        super(controller, interval, null, expiringSystems());
+        super(controller, interval);
     }
 
     @Override
@@ -77,11 +73,4 @@ public class ArtifactExpirer extends ControllerMaintainer {
         return true;
     }
 
-    /** Returns systems where artifacts can be expired */
-    private static Set<SystemName> expiringSystems() {
-        // Run only in public and main. Public systems have distinct container registries, while main and CD have
-        // shared registries.
-        return EnumSet.of(SystemName.Public, SystemName.PublicCd, SystemName.main);
-    }
-
 }