diff options
8 files changed, 10 insertions, 36 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 diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 97f613688d4..3587bed06a9 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -130,19 +130,6 @@ public class Flags { "Takes effect on next iteration of HostProvisionMaintainer.", APPLICATION_ID); - public static final UnboundBooleanFlag PROVISION_APPLICATION_CERTIFICATE = defineFeatureFlag( - "provision-application-certificate", false, - "Provision certificate from CA and include reference in deployment", - "Takes effect on deployment through controller", - APPLICATION_ID); - - public static final UnboundBooleanFlag DIRECT_ROUTING_USE_HTTPS_4443 = defineFeatureFlag( - "direct-routing-use-https-4443", false, - "Decides whether NLB is pointed at container on port 4443 (https) or 4080 (http)", - "Takes effect at redeployment", - APPLICATION_ID - ); - public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag( "default-term-wise-limit", 1.0, "Node resource memory in Gb for admin cluster nodes", diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java index 196a7ff2d05..3c237a9a8a0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java @@ -13,8 +13,7 @@ import java.util.Objects; */ public class Real implements Comparable<Real> { - // TODO: Change to 4443 when moving to HTTPS - private static final int defaultPort = 4080; + private static final int defaultPort = 4443; private final HostName hostname; private final String ipAddress; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java index 93efcbbf046..a7b37628289 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java @@ -50,13 +50,11 @@ public class LoadBalancerProvisioner { private final NodeRepository nodeRepository; private final CuratorDatabaseClient db; private final LoadBalancerService service; - private final BooleanFlag usePort4443Flag; public LoadBalancerProvisioner(NodeRepository nodeRepository, LoadBalancerService service, FlagSource flagSource) { this.nodeRepository = nodeRepository; this.db = nodeRepository.database(); this.service = service; - this.usePort4443Flag = Flags.DIRECT_ROUTING_USE_HTTPS_4443.bindTo(flagSource); // Read and write all load balancers to make sure they are stored in the latest version of the serialization format try (var lock = db.lockLoadBalancers()) { for (var id : db.readLoadBalancerIds()) { @@ -170,10 +168,9 @@ public class LoadBalancerProvisioner { Map<HostName, Set<String>> hostnameToIpAdresses = nodes.stream() .collect(Collectors.toMap(node -> HostName.from(node.hostname()), this::reachableIpAddresses)); - boolean usePort4443 = usePort4443Flag.with(FetchVector.Dimension.APPLICATION_ID, application.serializedForm()).value(); Set<Real> reals = new LinkedHashSet<>(); hostnameToIpAdresses.forEach((hostname, ipAddresses) -> { - ipAddresses.forEach(ipAddress -> reals.add(new Real(hostname, ipAddress, usePort4443 ? 4443 : 4080))); + ipAddresses.forEach(ipAddress -> reals.add(new Real(hostname, ipAddress))); }); log.log(LogLevel.INFO, "Creating load balancer for " + cluster + " in " + application.toShortString() + ", targeting: " + reals); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java index 91846d14aa1..9c42d0d95a1 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java @@ -67,9 +67,9 @@ public class LoadBalancerProvisionerTest { assertEquals(containerCluster1, lbApp1.get().get(0).id().cluster()); assertEquals(Collections.singleton(4443), lbApp1.get().get(0).instance().ports()); assertEquals("127.0.0.1", get(lbApp1.get().get(0).instance().reals(), 0).ipAddress()); - assertEquals(4080, get(lbApp1.get().get(0).instance().reals(), 0).port()); + assertEquals(4443, get(lbApp1.get().get(0).instance().reals(), 0).port()); assertEquals("127.0.0.2", get(lbApp1.get().get(0).instance().reals(), 1).ipAddress()); - assertEquals(4080, get(lbApp1.get().get(0).instance().reals(), 1).port()); + assertEquals(4443, get(lbApp1.get().get(0).instance().reals(), 1).port()); // A container is failed Supplier<List<Node>> containers = () -> tester.getNodes(app1).type(ClusterSpec.Type.container).asList(); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json index 19e65c2fc25..a9a728bab15 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json @@ -21,12 +21,12 @@ { "hostname": "host13.yahoo.com", "ipAddress": "127.0.13.1", - "port": 4080 + "port": 4443 }, { "hostname": "host14.yahoo.com", "ipAddress": "127.0.14.1", - "port": 4080 + "port": 4443 } ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json index 0b05a41af0a..515081bcb8e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json @@ -21,12 +21,12 @@ { "hostname": "host1.yahoo.com", "ipAddress": "127.0.1.1", - "port": 4080 + "port": 4443 }, { "hostname": "host10.yahoo.com", "ipAddress": "127.0.10.1", - "port": 4080 + "port": 4443 } ] }, @@ -51,12 +51,12 @@ { "hostname": "host13.yahoo.com", "ipAddress": "127.0.13.1", - "port": 4080 + "port": 4443 }, { "hostname": "host14.yahoo.com", "ipAddress": "127.0.14.1", - "port": 4080 + "port": 4443 } ] } |