From 23dc45e9c1ef992fbfdae5973c50150cd2b1c8a6 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 17 Jan 2023 18:30:11 +0100
Subject: Rename WireguardMaintainer -> ContainerWireguardTask

---
 .../node/admin/maintenance/ContainerWireguardTask.java     | 14 ++++++++++++++
 .../hosted/node/admin/maintenance/WireguardMaintainer.java | 14 --------------
 .../vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java   |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java
 delete mode 100644 node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/WireguardMaintainer.java

(limited to 'node-admin/src')

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java
new file mode 100644
index 00000000000..83d3a98d85d
--- /dev/null
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java
@@ -0,0 +1,14 @@
+package com.yahoo.vespa.hosted.node.admin.maintenance;
+
+import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
+
+/**
+ * Ensures that wireguard-go is running on the host.
+ *
+ * @author gjoranv
+ */
+public interface ContainerWireguardTask {
+
+    void converge(NodeAgentContext context);
+
+}
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/WireguardMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/WireguardMaintainer.java
deleted file mode 100644
index f7f1a421cd8..00000000000
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/WireguardMaintainer.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.yahoo.vespa.hosted.node.admin.maintenance;
-
-import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
-
-/**
- * Ensures that wireguard-go is running on the host.
- *
- * @author gjoranv
- */
-public interface WireguardMaintainer {
-
-    void converge(NodeAgentContext context);
-
-}
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 4e00290c86e..ec1e42a911e 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -24,7 +24,7 @@ import com.yahoo.vespa.hosted.node.admin.container.ContainerResources;
 import com.yahoo.vespa.hosted.node.admin.container.RegistryCredentials;
 import com.yahoo.vespa.hosted.node.admin.container.RegistryCredentialsProvider;
 import com.yahoo.vespa.hosted.node.admin.maintenance.StorageMaintainer;
-import com.yahoo.vespa.hosted.node.admin.maintenance.WireguardMaintainer;
+import com.yahoo.vespa.hosted.node.admin.maintenance.ContainerWireguardTask;
 import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.identity.CredentialsMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.servicedump.VespaServiceDumper;
@@ -72,7 +72,7 @@ public class NodeAgentImpl implements NodeAgent {
     private final Duration warmUpDuration;
     private final DoubleFlag containerCpuCap;
     private final VespaServiceDumper serviceDumper;
-    private final Optional<WireguardMaintainer> wireguardMaintainer;
+    private final Optional<ContainerWireguardTask> wireguardMaintainer;
 
     private Thread loopThread;
     private ContainerState containerState = UNKNOWN;
@@ -108,7 +108,7 @@ public class NodeAgentImpl implements NodeAgent {
                          RegistryCredentialsProvider registryCredentialsProvider, StorageMaintainer storageMaintainer,
                          FlagSource flagSource, List<CredentialsMaintainer> credentialsMaintainers,
                          Optional<AclMaintainer> aclMaintainer, Optional<HealthChecker> healthChecker, Clock clock,
-                         VespaServiceDumper serviceDumper, Optional<WireguardMaintainer> wireguardMaintainer) {
+                         VespaServiceDumper serviceDumper, Optional<ContainerWireguardTask> wireguardMaintainer) {
         this(contextSupplier, nodeRepository, orchestrator, containerOperations, registryCredentialsProvider,
              storageMaintainer, flagSource, credentialsMaintainers, aclMaintainer, healthChecker, clock,
              DEFAULT_WARM_UP_DURATION, serviceDumper, wireguardMaintainer);
@@ -120,7 +120,7 @@ public class NodeAgentImpl implements NodeAgent {
                          FlagSource flagSource, List<CredentialsMaintainer> credentialsMaintainers,
                          Optional<AclMaintainer> aclMaintainer, Optional<HealthChecker> healthChecker, Clock clock,
                          Duration warmUpDuration, VespaServiceDumper serviceDumper,
-                         Optional<WireguardMaintainer> wireguardMaintainer) {
+                         Optional<ContainerWireguardTask> wireguardMaintainer) {
         this.contextSupplier = contextSupplier;
         this.nodeRepository = nodeRepository;
         this.orchestrator = orchestrator;
-- 
cgit v1.2.3