summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2023-03-02 13:07:45 +0100
committerGitHub <noreply@github.com>2023-03-02 13:07:45 +0100
commit3a582c710202df61478650fae8d339e273f52b95 (patch)
treee079c24f8051ff13de353e02bd7133f4c2f8bcad /controller-server/src/main/java/com/yahoo
parent1fe9b954fd69ea358c48da78d287bc28dfa616b5 (diff)
Revert "Run ArtifactExpirer more often in cd systems"
Diffstat (limited to 'controller-server/src/main/java/com/yahoo')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java3
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);