Remove remains of wgKeyTimestamp in NodeAttributes

2 files changed, 1 insertions, 7 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 d5ac471f92e..5d87c5dd3fc 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
@@ -34,7 +34,6 @@ public class NodeAttributes {
     private Optional<Instant> currentFirmwareCheck = Optional.empty();
     private List<TrustStoreItem> trustStore = List.of();
     private Optional<WireguardKey> wireguardPubkey = Optional.empty();
-    private Optional<Instant> wireguardKeyTimestamp = Optional.empty();
     /** The list of reports to patch. A null value is used to remove the report. */
     private Map<String, JsonNode> reports = new TreeMap<>();
 
@@ -138,8 +137,6 @@ public class NodeAttributes {
 
     public Optional<WireguardKey> getWireguardPubkey() { return wireguardPubkey; }
 
-    public Optional<Instant> getWireguardKeyTimestamp() { return wireguardKeyTimestamp; }
-
     public Map<String, JsonNode> getReports() {
         return reports;
     }
@@ -151,7 +148,7 @@ public class NodeAttributes {
     @Override
     public int hashCode() {
         return Objects.hash(hostId, restartGeneration, rebootGeneration, dockerImage, vespaVersion, currentOsVersion,
-                            currentFirmwareCheck, trustStore, wireguardPubkey, wireguardKeyTimestamp, reports);
+                            currentFirmwareCheck, trustStore, wireguardPubkey, reports);
     }
 
     public boolean isEmpty() {
@@ -173,7 +170,6 @@ public class NodeAttributes {
                 && Objects.equals(currentFirmwareCheck, other.currentFirmwareCheck)
                 && Objects.equals(trustStore, other.trustStore)
                 && Objects.equals(wireguardPubkey, other.wireguardPubkey)
-                && Objects.equals(wireguardKeyTimestamp, other.wireguardKeyTimestamp)
                 && Objects.equals(reports, other.reports);
     }
 
@@ -188,7 +184,6 @@ public class NodeAttributes {
                          currentFirmwareCheck.map(at -> "currentFirmwareCheck=" + at),
                          Optional.ofNullable(trustStore.isEmpty() ? null : "trustStore=" + trustStore),
                          Optional.ofNullable(wireguardPubkey.isEmpty() ? null : "wireguardPubkey=" + wireguardPubkey),
-                            Optional.ofNullable(wireguardKeyTimestamp.isEmpty() ? null : "wireguardKeyTimestamp=" + wireguardKeyTimestamp),
                          Optional.ofNullable(reports.isEmpty() ? null : "reports=" + reports))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index db22b8bafe2..0300d7e92ff 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -728,7 +728,6 @@ public class NodeSpec {
             // Always replace entire trust store
             trustStore(attributes.getTrustStore());
             attributes.getWireguardPubkey().ifPresent(this::wireguardPubkey);
-            attributes.getWireguardKeyTimestamp().ifPresent(this::wireguardKeyTimestamp);
             this.reports.updateFromRawMap(attributes.getReports());
 
             return this;