diff options
author | gjoranv <gjoranv@gmail.com> | 2023-09-12 23:37:39 +0200 |
---|---|---|
committer | gjoranv <gjoranv@gmail.com> | 2023-09-13 11:04:53 +0200 |
commit | eb5b202c5ad5306563fca804c3aaf3c2858687e2 (patch) | |
tree | 58bdc1d89930bad1d2a183bfe2f6bd073b7a58de /node-admin | |
parent | 7bfcb402e4eabc26ad9174f789e813435bbf8f0e (diff) |
Set wg timestamp from NodePatcher clock
.. instead of sending it from the client.
Diffstat (limited to 'node-admin')
3 files changed, 1 insertions, 8 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java index 295b0623aa0..d5ac471f92e 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeAttributes.java @@ -89,11 +89,6 @@ public class NodeAttributes { return this; } - public NodeAttributes withWireguardKeyTimestamp(Instant wireguardKeyTimestamp) { - this.wireguardKeyTimestamp = Optional.of(wireguardKeyTimestamp); - return this; - } - public NodeAttributes withReports(Map<String, JsonNode> nodeReports) { this.reports = new TreeMap<>(nodeReports); return this; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java index 84cbc7d40ed..a48372c334f 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java @@ -362,7 +362,6 @@ public class RealNodeRepository implements NodeRepository { .map(item -> new NodeRepositoryNode.TrustStoreItem(item.fingerprint(), item.expiry().toEpochMilli())) .toList(); node.wireguardPubkey = nodeAttributes.getWireguardPubkey().map(WireguardKey::value).orElse(null); - node.wireguardKeyTimestamp = nodeAttributes.getWireguardKeyTimestamp().map(Instant::toEpochMilli).orElse(null); Map<String, JsonNode> reports = nodeAttributes.getReports(); node.reports = reports == null || reports.isEmpty() ? null : new TreeMap<>(reports); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java index 35ed8a3e6ea..d5e6ae59c62 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java @@ -146,8 +146,7 @@ public class RealNodeRepositoryTest { new NodeAttributes() .withRestartGeneration(1) .withDockerImage(DockerImage.fromString(dockerImage)) - .withWireguardPubkey(wireguardKey) - .withWireguardKeyTimestamp(wireguardKeyTimestamp)); + .withWireguardPubkey(wireguardKey)); NodeSpec hostSpec = nodeRepositoryApi.getOptionalNode(hostname).orElseThrow(); assertEquals(1, hostSpec.currentRestartGeneration().orElseThrow()); |