From 67e01e3d54eeddf327839a40463d7eaf9b22f73c Mon Sep 17 00:00:00 2001
From: andreer <andreer@verizonmedia.com>
Date: Thu, 14 Nov 2019 13:11:40 +0100
Subject: remove direct routing feature flags

---
 .../com/yahoo/vespa/hosted/controller/ApplicationController.java  | 8 --------
 .../java/com/yahoo/vespa/hosted/controller/ControllerTest.java    | 1 -
 2 files changed, 9 deletions(-)

(limited to 'controller-server')

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 21a1b3c1eda..3f985e95a4f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -128,7 +128,6 @@ public class ApplicationController {
     private final RoutingPolicies routingPolicies;
     private final Clock clock;
     private final DeploymentTrigger deploymentTrigger;
-    private final BooleanFlag provisionApplicationCertificate;
     private final ApplicationPackageValidator applicationPackageValidator;
 
     ApplicationController(Controller controller, CuratorDb curator,
@@ -146,7 +145,6 @@ public class ApplicationController {
         routingPolicies = new RoutingPolicies(controller);
         rotationRepository = new RotationRepository(rotationsConfig, this, curator);
         deploymentTrigger = new DeploymentTrigger(controller, clock);
-        provisionApplicationCertificate = Flags.PROVISION_APPLICATION_CERTIFICATE.bindTo(controller.flagSource());
         applicationPackageValidator = new ApplicationPackageValidator(controller);
 
         // Update serialization format of all applications
@@ -565,12 +563,6 @@ public class ApplicationController {
     }
 
     private Optional<ApplicationCertificate> getApplicationCertificate(Instance instance) {
-        boolean provisionCertificate = provisionApplicationCertificate.with(FetchVector.Dimension.APPLICATION_ID,
-                                                                            instance.id().serializedForm()).value();
-        if (!provisionCertificate) {
-            return Optional.empty();
-        }
-
         // Re-use certificate if already provisioned
         Optional<ApplicationCertificate> applicationCertificate = curator.readApplicationCertificate(instance.id());
         if(applicationCertificate.isPresent())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index dbe451fd433..52ac9c8088a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -741,7 +741,6 @@ public class ControllerTest {
 
     @Test
     public void testDeploySelectivelyProvisionsCertificate() {
-        ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.PROVISION_APPLICATION_CERTIFICATE.id(), true);
         Function<Instance, Optional<ApplicationCertificate>> certificate = (application) -> tester.controller().curator().readApplicationCertificate(application.id());
 
         // Create app1
-- 
cgit v1.2.3