From eb5b202c5ad5306563fca804c3aaf3c2858687e2 Mon Sep 17 00:00:00 2001
From: gjoranv <gjoranv@gmail.com>
Date: Tue, 12 Sep 2023 23:37:39 +0200
Subject: Set wg timestamp from NodePatcher clock .. instead of sending it from
 the client.

---
 .../node/admin/configserver/noderepository/NodeAttributes.java       | 5 -----
 .../node/admin/configserver/noderepository/RealNodeRepository.java   | 1 -
 .../admin/configserver/noderepository/RealNodeRepositoryTest.java    | 3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'node-admin')

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());
-- 
cgit v1.2.3