diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-11-15 10:56:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 10:56:46 +0100 |
| commit | 3d55bbd557d8f81664c342c4ce65490c7b8e07de (patch) | |
| tree | 03148153f1cd95266f38484d08e638bec0f30a6e /controller-server | |
| parent | 0b7f1fe7b5532b46d352df70dc905d1eb28775a8 (diff) | |
| parent | 67e01e3d54eeddf327839a40463d7eaf9b22f73c (diff) | |
Merge pull request #11300 from vespa-engine/andreer/remove-direct-routing-feature-flags
remove direct routing feature flags
Diffstat (limited to 'controller-server')
2 files changed, 0 insertions, 9 deletions
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 |