Merge pull request #26853 from vespa-engine/hakonhall/remove-wireguard-workaround-no-longer-needed

Remove wireguard workaround no longer needed

1 files changed, 2 insertions, 13 deletions

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 7c84afc8397..025a04a15d6 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
@@ -506,14 +506,6 @@ public class NodeAgentImpl implements NodeAgent {
                 storageMaintainer.cleanDiskIfFull(context);
                 storageMaintainer.handleCoreDumpsForContainer(context, container, false);
 
-                // TODO: this is a workaround for restarting wireguard as early as possible after host-admin has been down.
-                var runOrdinaryWireguardTasks = true;
-                if (container.isPresent() && container.get().state().isRunning()) {
-                    Optional<Container> finalContainer = container;
-                    wireguardTasks.forEach(task -> task.converge(context, finalContainer.get().id()));
-                    runOrdinaryWireguardTasks = false;
-                }
-
                 if (downloadImageIfNeeded(context, container)) {
                     context.log(logger, "Waiting for image to download " + context.node().wantedDockerImage().get().asString());
                     return;
@@ -525,16 +517,13 @@ public class NodeAgentImpl implements NodeAgent {
                     containerState = STARTING;
                     container = Optional.of(startContainer(context));
                     containerState = UNKNOWN;
-                    runOrdinaryWireguardTasks = true;
                 } else {
                     container = Optional.of(updateContainerIfNeeded(context, container.get()));
                 }
 
                 aclMaintainer.ifPresent(maintainer -> maintainer.converge(context));
-                if (runOrdinaryWireguardTasks) {
-                    Optional<Container> finalContainer = container;
-                    wireguardTasks.forEach(task -> task.converge(context, finalContainer.get().id()));
-                }
+                final Optional<Container> finalContainer = container;
+                wireguardTasks.forEach(task -> task.converge(context, finalContainer.get().id()));
                 startServicesIfNeeded(context);
                 resumeNodeIfNeeded(context);
                 if (healthChecker.isPresent()) {