diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-09-12 09:36:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 09:36:04 +0200 |
| commit | b741895853fec582fb45dee42b8c78057118d0b8 (patch) | |
| tree | 64a6f89d2d57e0b362120bd4c130c10a4a6be856 | |
| parent | 428bd813d6be2bcbd92bb5257c4222f5a985eff3 (diff) | |
| parent | d465f92d4e83d84ae632993c3dac70c9d8ece22d (diff) | |
Merge pull request #10619 from vespa-engine/revert-10580-mortent/reapply-nlb-4443
Revert "Reapply: "Use real port 4443 for NLBs"" MERGEOK
4 files changed, 10 insertions, 9 deletions
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 3c237a9a8a0..196a7ff2d05 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,7 +13,8 @@ import java.util.Objects; */ public class Real implements Comparable<Real> { - private static final int defaultPort = 4443; + // TODO: Change to 4443 when moving to HTTPS + private static final int defaultPort = 4080; private final HostName hostname; private final String ipAddress; 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 c1df79ce492..9aa1cc4bd47 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(4443, get(lbApp1.get().get(0).instance().reals(), 0).port()); + assertEquals(4080, get(lbApp1.get().get(0).instance().reals(), 0).port()); assertEquals("127.0.0.2", get(lbApp1.get().get(0).instance().reals(), 1).ipAddress()); - assertEquals(4443, get(lbApp1.get().get(0).instance().reals(), 1).port()); + assertEquals(4080, 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 a9a728bab15..19e65c2fc25 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": 4443 + "port": 4080 }, { "hostname": "host14.yahoo.com", "ipAddress": "127.0.14.1", - "port": 4443 + "port": 4080 } ] } 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 515081bcb8e..0b05a41af0a 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": 4443 + "port": 4080 }, { "hostname": "host10.yahoo.com", "ipAddress": "127.0.10.1", - "port": 4443 + "port": 4080 } ] }, @@ -51,12 +51,12 @@ { "hostname": "host13.yahoo.com", "ipAddress": "127.0.13.1", - "port": 4443 + "port": 4080 }, { "hostname": "host14.yahoo.com", "ipAddress": "127.0.14.1", - "port": 4443 + "port": 4080 } ] } |