From 6b33bcb764bef5c7c63caa09221fa7288860e7ef Mon Sep 17 00:00:00 2001
From: andreer <andreer@verizonmedia.com>
Date: Wed, 30 Jun 2021 21:54:45 +0200
Subject: retrigger to deploy certificates faster

---
 .../hosted/controller/maintenance/EndpointCertificateMaintainer.java  | 4 ++--
 .../controller/maintenance/EndpointCertificateMaintainerTest.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'controller-server/src')

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java
index 85a69b0f338..cd7ce8c3fa6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java
@@ -86,14 +86,14 @@ public class EndpointCertificateMaintainer extends ControllerMaintainer {
     }
 
     /**
-     * If it's been a week since the cert has been refreshed, re-trigger all prod deployment jobs.
+     * If it's been four days since the cert has been refreshed, re-trigger all prod deployment jobs.
      */
     private void deployRefreshedCertificates() {
         var now = clock.instant();
         curator.readAllEndpointCertificateMetadata().forEach((applicationId, endpointCertificateMetadata) ->
                                                                      endpointCertificateMetadata.lastRefreshed().ifPresent(lastRefreshTime -> {
                                                                          Instant refreshTime = Instant.ofEpochSecond(lastRefreshTime);
-                                                                         if (now.isAfter(refreshTime.plus(7, ChronoUnit.DAYS))) {
+                                                                         if (now.isAfter(refreshTime.plus(4, ChronoUnit.DAYS))) {
                                                                              controller().applications().getInstance(applicationId)
                                                                                          .ifPresent(instance -> instance.productionDeployments().forEach((zone, deployment) -> {
                                                                                              if (deployment.at().isBefore(refreshTime)) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java
index ce219b8beed..3ed26b4fb6e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java
@@ -82,7 +82,7 @@ public class EndpointCertificateMaintainerTest {
     }
 
     @Test
-    public void refreshed_certificate_is_deployed_after_one_week() {
+    public void refreshed_certificate_is_deployed_after_four_days() {
         var appId = ApplicationId.from("tenant", "application", "default");
 
         DeploymentTester deploymentTester = new DeploymentTester(tester);
@@ -107,7 +107,7 @@ public class EndpointCertificateMaintainerTest {
 
         maintainer.maintain();
 
-        tester.clock().advance(Duration.ofDays(8));
+        tester.clock().advance(Duration.ofDays(4));
 
         deploymentContext.assertNotRunning(productionUsWest1);
 
-- 
cgit v1.2.3