From 3a582c710202df61478650fae8d339e273f52b95 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Thu, 2 Mar 2023 13:07:45 +0100
Subject: Revert "Run ArtifactExpirer more often in cd systems"

---
 .../vespa/hosted/controller/maintenance/ControllerMaintenance.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'controller-server')

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);
-- 
cgit v1.2.3