diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-11-20 17:45:40 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-11-20 17:46:31 +0100 |
| commit | 2acb14c31c6d58d61ba28aa4805bb679be5ec175 (patch) | |
| tree | 764684f191e016521355c327cd5eb72694adefaf /node-repository | |
| parent | 4c024aa9ce26f664e09afe2b4fb1abc6710e6e78 (diff) | |
Port 8443 no longer used by controller
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 3 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 96e1384d5f1..a9ae0c34028 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 @@ -225,10 +225,9 @@ public class NodeRepository extends AbstractComponent { case controller: // Controllers: // - port 4443 (HTTPS + Athenz) from the world - // - port 443+8443 (HTTPS + Okta) from the world. NOTE: controller host has 443->8443 iptable mapping. + // - port 443 (HTTPS + Okta) from the world trustedPorts.add(4443); trustedPorts.add(443); - trustedPorts.add(8443); 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 e2f3df97314..c9edd13dbab 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 @@ -161,7 +161,7 @@ public class AclProvisioningTest { // Controllers and hosts all trust each other List<NodeAcl> controllerAcls = tester.nodeRepository().getNodeAcls(controllers.get(0), false); assertAcls(Collections.singletonList(controllers), controllerAcls); - assertEquals(ImmutableSet.of(22, 4443, 443, 8443), controllerAcls.get(0).trustedPorts()); + assertEquals(ImmutableSet.of(22, 4443, 443), controllerAcls.get(0).trustedPorts()); } @Test |