no need to compute runstatus

2 files changed, 3 insertions, 5 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java
index eaf80d51770..6099ecbb253 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateException.java
@@ -15,7 +15,7 @@ public class EndpointCertificateException extends RuntimeException {
         this.type = type;
     }
 
-    public Type getType() {
+    public Type type() {
         return type;
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index f82425e743c..927ebca67ec 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -301,16 +301,14 @@ public class InternalStepRunner implements StepRunner {
 
             throw e;
         } catch (EndpointCertificateException e) {
-            switch (e.getType()) {
+            switch (e.type()) {
                 case CERT_NOT_AVAILABLE:
                     // Same as CERTIFICATE_NOT_READY above, only from the controller
-                    Optional<RunStatus> result = startTime.isBefore(controller.clock().instant().minus(Duration.ofHours(1)))
-                            ? Optional.of(deploymentFailed) : Optional.empty();
                     if (startTime.plus(endpointCertificateTimeout).isBefore(controller.clock().instant())) {
                         logger.log("Deployment failed to find provisioned endpoint certificate after " + endpointCertificateTimeout);
                         return Optional.of(RunStatus.endpointCertificateTimeout);
                     }
-                    return result;
+                    return Optional.empty();
                 default:
                     throw e; // Should be surfaced / fail deployment
             }