Stop using wireguardPubkey

3 files changed, 0 insertions, 15 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
index 19b9fc26fd3..93160bf7689 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
@@ -109,7 +109,6 @@ public class NodePatcher {
                                               "reports",
                                               "trustStore",
                                               "vespaVersion",
-                                              "wireguardPubkey", // TODO wg: remove when all nodes use new key+timestamp format
                                               "wireguard"));
             if (!disallowedFields.isEmpty()) {
                 throw new IllegalArgumentException("Patching fields not supported: " + disallowedFields);
@@ -279,9 +278,6 @@ public class NodePatcher {
                 // This is where we set the key timestamp.
                 var key = SlimeUtils.optionalString(value.field("key")).map(WireguardKey::new).orElse(null);
                 return node.withWireguardPubkey(new WireguardKeyWithTimestamp(key, clock.instant()));
-            case "wireguardPubkey":  // TODO wg: remove when all nodes use new key+timestamp format
-                var oldKey = SlimeUtils.optionalString(value).map(WireguardKey::new).orElse(null);
-                return node.withWireguardPubkey(new WireguardKeyWithTimestamp(oldKey, clock.instant()));
             default:
                 throw new IllegalArgumentException("Could not apply field '" + name + "' on a node: No such modifiable field");
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 73e48d6df55..dd6b0b5a6df 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -195,12 +195,6 @@ class NodesResponse extends SlimeJsonResponse {
             object.setString("cloudAccount", node.cloudAccount().value());
         }
         node.wireguardPubKey().ifPresent(key -> toSlime(key, object.setObject("wireguard")));
-
-        // TODO wg: remove when all nodes have upgraded to new key+timestamp format
-        node.wireguardPubKey().ifPresent(key -> {
-            object.setString("wireguardPubkey", key.key().value());
-            object.setLong("wireguardKeyTimestamp", key.timestamp().toEpochMilli());
-        });
     }
 
     private Version resolveVersionFlag(StringFlag flag, Node node, Allocation allocation) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java
index 3ffcb2f90c0..237d001d23c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java
@@ -44,11 +44,6 @@ public class WireguardResponse extends SlimeJsonResponse {
     private void addConfigserver(Cursor cfgEntry, String hostname, WireguardKeyWithTimestamp keyWithTimestamp,
                                  List<String> ipAddresses) {
         cfgEntry.setString("hostname", hostname);
-
-        // TODO wg: remove when all nodes are using new key+timestamp format
-        cfgEntry.setString("wireguardPubkey", keyWithTimestamp.key().value());
-        cfgEntry.setLong("wireguardKeyTimestamp", keyWithTimestamp.timestamp().toEpochMilli());
-
         NodesResponse.ipAddressesToSlime(ipAddresses, cfgEntry.setArray("ipAddresses"));
         toSlime(keyWithTimestamp, cfgEntry.setObject("wireguard"));
     }