Merge pull request #26272 from vespa-engine/revert-26269-run-AartifactExpirer-more-often-in-cd-systems

Revert "Run ArtifactExpirer more often in cd systems"

1 files changed, 1 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
index 052592e0ef0..bcc8296da2a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
@@ -162,8 +162,7 @@ public class ControllerMaintenance extends AbstractComponent {
             this.resourceMeterMaintainer = duration(3, MINUTES);
             this.resourceTagMaintainer = duration(30, MINUTES);
             this.applicationMetaDataGarbageCollector = duration(12, HOURS);
-            // TODO: Temporarily use another duration in cd systems
-            this.containerImageExpirer = system.isCd() ? duration(15, MINUTES) : duration(12, HOURS);
+            this.containerImageExpirer = duration(12, HOURS);
             this.hostInfoUpdater = duration(12, HOURS);
             this.reindexingTriggerer = duration(1, HOURS);
             this.endpointCertificateMaintainer = duration(1, HOURS);