summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2021-06-15 08:34:36 +0200
committerGitHub <noreply@github.com>2021-06-15 08:34:36 +0200
commit0ce38c822119230a85f58ebdecb0b80c6ab24a80 (patch)
tree151ad9b71e404f8b391fd614472d4721c5cd9d25 /node-repository
parent5667784f2fca043d79863160946dce85832890b6 (diff)
parent98c2bc9669c19c92a749d34990745d31b5e3504f (diff)
Merge pull request #18248 from vespa-engine/hakonhall/avoid-triggering-disk-encryption-on-proxy-hosts-for-now
Avoid triggering disk encryption on proxy hosts for now
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostEncrypter.java2
1 files changed, 2 insertions, 0 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 80f74a011c0..6d88e43630a 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
@@ -48,6 +48,8 @@ public class HostEncrypter extends NodeRepositoryMaintainer {
NodeList allNodes = nodeRepository().nodes().list();
for (var nodeType : NodeType.values()) {
if (!nodeType.isHost()) continue;
+ // TODO: Require a minimum number of proxies in Orchestrator. For now skip proxy hosts.
+ if (nodeType == NodeType.proxyhost) continue;
if (upgradingVespa(allNodes, nodeType)) continue;
unencryptedHosts(allNodes, nodeType).forEach(host -> encrypt(host, now));
}