diff options
| author | andreer <andreer@verizonmedia.com> | 2020-04-08 10:10:31 +0200 |
|---|---|---|
| committer | andreer <andreer@verizonmedia.com> | 2020-04-08 10:10:31 +0200 |
| commit | 11bbae043ce0a7a399da6a781979ba71c6460373 (patch) | |
| tree | 06ad256ce4d17053596e54dfc81963dce5994619 /node-repository | |
| parent | c1d615306b1474bff55721a98800ce4a089e2a7b (diff) | |
open port 80 on controllers
Diffstat (limited to 'node-repository')
2 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 77fa7dfc7e4..6f7be09aa0e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -296,8 +296,10 @@ public class NodeRepository extends AbstractComponent { // Controllers: // - port 4443 (HTTPS + Athenz) from the world // - port 443 (HTTPS + Okta) from the world + // - port 80 (HTTP) from the world - for redirect to HTTPS/443 only trustedPorts.add(4443); trustedPorts.add(443); + trustedPorts.add(80); break; default: diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java index bbba87f443e..2a87f513cd9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java @@ -158,7 +158,7 @@ public class AclProvisioningTest { // Controllers and hosts all trust each other List<NodeAcl> controllerAcls = tester.nodeRepository().getNodeAcls(controllers.get(0), false); assertAcls(List.of(controllers), controllerAcls); - assertEquals(Set.of(22, 4443, 443), controllerAcls.get(0).trustedPorts()); + assertEquals(Set.of(22, 80, 4443, 443), controllerAcls.get(0).trustedPorts()); } @Test |