Merge pull request #18734 from vespa-engine/hakonhall/no-longer-ignore-proxyhost-with-max-encrypting-hosts

No longer ignore proxyhost with max-encrypting-hosts

2 files changed, 4 insertions, 5 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypter.java
index a4569f03d82..acd109ebfe4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypter.java
@@ -116,9 +116,6 @@ public class HostEncrypter extends NodeRepositoryMaintainer {
     }
 
     private boolean encryptHost(Node host, NodeList allNodes, Set<ApplicationId> deferredApplications) {
-        // TODO: Require a minimum number of proxies in Orchestrator. For now skip proxy hosts.
-        if (host.type() == NodeType.proxyhost) return false;
-
         Set<ApplicationId> applicationsOnHost = allNodes.childrenOf(host).stream()
                                                         .filter(node -> node.allocation().isPresent())
                                                         .map(node -> node.allocation().get().owner())
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypterTest.java
index 1e5d57263fa..2ce3ef50c49 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypterTest.java
@@ -70,9 +70,11 @@ public class HostEncrypterTest {
         NodeList allNodes = tester.nodeRepository().nodes().list();
         NodeList encryptingHosts = allNodes.encrypting().parents();
 
-        assertEquals(1, encryptingHosts.size());
+        assertEquals(1, encryptingHosts.nodeType(NodeType.proxyhost).size());
+
+        assertEquals(1, encryptingHosts.nodeType(NodeType.host).size());
         assertEquals("Host of included application is encrypted", Set.of(app1),
-                     allNodes.childrenOf(encryptingHosts.asList().get(0)).stream()
+                     allNodes.childrenOf(encryptingHosts.nodeType(NodeType.host).asList().get(0)).stream()
                              .map(node -> node.allocation().get().owner())
                              .collect(Collectors.toSet()));
     }