diff options
| author | Andreas Eriksen <andreer@yahooinc.com> | 2022-11-02 20:39:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-02 20:39:07 +0100 |
| commit | 4e5300c8206a56b9bf859448e15d7b45f3e622fd (patch) | |
| tree | 87505f2576b5c544ff3f581d3fdd826de8b452ae | |
| parent | 63d6944271a76d34198a08fe7e0355b6191499d6 (diff) | |
Revert "open port for wireguard in acl (#24718)" (#24723)
This reverts commit 19473611963b61e5436ed14601a1583b1cc16182.
3 files changed, 1 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java index b1c94e17bd3..e61f9b79d75 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/NodeAcl.java @@ -86,12 +86,10 @@ public record NodeAcl(Node node, // - port 19070 (RPC) from all tenant nodes (and their hosts, in case traffic is NAT-ed via parent) // - port 19070 (RPC) from all proxy nodes (and their hosts, in case traffic is NAT-ed via parent) // - port 4443 from the world - // - port 51820 from the world (WireGuard) trustedNodes.addAll(TrustedNode.of(allNodes.nodeType(NodeType.host, NodeType.tenant, NodeType.proxyhost, NodeType.proxy), RPC_PORTS)); trustedPorts.add(4443); - trustedPorts.add(51820); } case proxy -> { // Proxy nodes trust: 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 d54667d3dbe..ea9c0e1193d 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 @@ -109,7 +109,7 @@ public class AclProvisioningTest { TrustedNode.of(configNodes)), Set.of("10.2.3.0/24", "10.4.5.0/24"), List.of(nodeAcl)); - assertEquals(Set.of(22, 4443, 51820), nodeAcl.trustedPorts()); + assertEquals(Set.of(22, 4443), nodeAcl.trustedPorts()); } @Test diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json index 85530ce0b0d..4223a1b186a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json @@ -274,10 +274,6 @@ { "port": 4443, "trustedBy": "cfg1.yahoo.com" - }, - { - "port":51820, - "trustedBy":"cfg1.yahoo.com" } ] } |