Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations"

This reverts commit 9b6a78d

3 files changed, 11 insertions, 3 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index 4b8c3a222c2..cf5937579db 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -46,11 +46,14 @@ public class DockerOperationsImpl implements DockerOperations {
 
     private final Docker docker;
     private final ProcessExecuter processExecuter;
+    private final List<String> configServerHostnames;
     private final IPAddresses ipAddresses;
 
-    public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter, IPAddresses ipAddresses) {
+    public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter,
+                                List<String> configServerHostnames, IPAddresses ipAddresses) {
         this.docker = docker;
         this.processExecuter = processExecuter;
+        this.configServerHostnames = configServerHostnames;
         this.ipAddresses = ipAddresses;
     }
 
@@ -63,12 +66,15 @@ public class DockerOperationsImpl implements DockerOperations {
                 () -> new RuntimeException("Unable to find a valid IPv6 address for " + node.getHostname() +
                         ". Missing an AAAA DNS entry?"));
 
+        String configServers = String.join(",", configServerHostnames);
+
         Docker.CreateContainerCommand command = docker.createContainerCommand(
                 node.getWantedDockerImage().get(),
                 ContainerResources.from(node.getMinCpuCores(), node.getMinMainMemoryAvailableGb()),
                 context.containerName(),
                 node.getHostname())
                 .withManagedBy(MANAGER_NAME)
+                .withEnvironment("VESPA_CONFIGSERVERS", configServers)
                 .withUlimit("nofile", 262_144, 262_144)
                 // The nproc aka RLIMIT_NPROC resource limit works as follows:
                 //  - A process has a (soft) nproc limit, either inherited by the parent or changed with setrlimit(2).
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index 99b3fde4eb1..d93d33617e3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -20,6 +20,7 @@ import org.mockito.InOrder;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.file.Paths;
+import java.util.Collections;
 import java.util.Optional;
 import java.util.OptionalLong;
 
@@ -39,7 +40,7 @@ public class DockerOperationsImplTest {
     private final ProcessExecuter processExecuter = mock(ProcessExecuter.class);
     private final IPAddresses ipAddresses = new IPAddressesMock();
     private final DockerOperationsImpl dockerOperations = new DockerOperationsImpl(
-            docker, processExecuter, ipAddresses);
+            docker, processExecuter, Collections.emptyList(), ipAddresses);
 
     @Test
     public void processResultFromNodeProgramWhenSuccess() {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index b9592c9787d..9385e604142 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -29,6 +29,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Clock;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.logging.Logger;
@@ -89,7 +90,7 @@ public class DockerTester implements AutoCloseable {
 
         Clock clock = Clock.systemUTC();
         FileSystem fileSystem = TestFileSystem.create();
-        DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, ipAddresses);
+        DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, Collections.emptyList(), ipAddresses);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
         Function<String, NodeAgent> nodeAgentFactory = (hostName) -> new NodeAgentImpl(