Remove special handling for vespa/ci

4 files changed, 1 insertions, 44 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 ae8fdfb9d2e..65a9b2869b0 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
@@ -352,8 +352,7 @@ public class DockerOperationsImpl implements DockerOperations {
             Stream.of(pathsInNode).forEach(pathString -> {
                 Path absolutePathInNode = resolveNodePath(pathString);
                 Path pathOnHost = context.pathOnHostFromPathInNode(absolutePathInNode);
-                Path pathInNode = context.rewritePathInNodeForWantedDockerImage(absolutePathInNode);
-                command.withVolume(pathOnHost, pathInNode);
+                command.withVolume(pathOnHost, absolutePathInNode);
             });
         }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
index 872b8a8096b..3c6df0c74a2 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
@@ -92,12 +92,4 @@ public interface NodeAgentContext extends TaskContext {
     default Path pathInNodeUnderVespaHome(String relativePath) {
         return pathInNodeUnderVespaHome(fileSystem().getPath(relativePath));
     }
-
-    /**
-     * Rewrite the given path in node to a path required by the image.
-     * WARNING: This method should only be used when starting the docker container, e.g. writing container data or
-     * configuring mounts.
-     * TODO: Remove when everyone has migrated of vespa/ci image
-     */
-    Path rewritePathInNodeForWantedDockerImage(Path path);
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
index c7c0675c30e..6e4d090f830 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
@@ -176,18 +176,6 @@ public class NodeAgentContextImpl implements NodeAgentContext {
     }
 
     @Override
-    public Path rewritePathInNodeForWantedDockerImage(Path path) {
-        requireValidPath(path);
-
-        if (!node().wantedDockerImage().get().repository().endsWith("/vespa/ci")) return path;
-
-        Path originalVespaHome = pathInNodeUnderVespaHome("");
-        if (!path.startsWith(originalVespaHome)) return path;
-
-        return fileSystem.getPath("/home/y").resolve(originalVespaHome.relativize(path));
-    }
-
-    @Override
     public String toString() {
         return "NodeAgentContextImpl{" +
                 "node=" + node +
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java
index b7e0a2a1d97..a37a0bad125 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImplTest.java
@@ -1,15 +1,12 @@
 // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.nodeagent;
 
-import com.yahoo.config.provision.DockerImage;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.test.file.TestFileSystem;
 import org.junit.Test;
 
 import java.nio.file.FileSystem;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -79,17 +76,6 @@ public class NodeAgentContextImplTest {
     }
 
     @Test
-    public void rewrites_vespa_home_mount_point() {
-        assertRewrite("docker.tld/vespa/ci:1.2.3", "/var/log", "/var/log");
-        assertRewrite("docker.tld/vespa/ci:1.2.3", "/home/y/log", "/home/y/log");
-        assertRewrite("docker.tld/vespa/ci:1.2.3", "/opt/vespa/log", "/home/y/log");
-
-        assertRewrite("docker.tld/vespa/hosted:1.2.3", "/var/log", "/var/log");
-        assertRewrite("docker.tld/vespa/hosted:1.2.3", "/home/y/log", "/home/y/log");
-        assertRewrite("docker.tld/vespa/hosted:1.2.3", "/opt/vespa/log", "/opt/vespa/log");
-    }
-
-    @Test
     public void disabledTasksTest() {
         NodeAgentContext context1 = createContextWithDisabledTasks();
         assertFalse(context1.isDisabled(NodeAgentTask.DiskCleanup));
@@ -105,12 +91,4 @@ public class NodeAgentContextImplTest {
         flagSource.withListFlag(Flags.DISABLED_HOST_ADMIN_TASKS.id(), List.of(tasks), String.class);
         return new NodeAgentContextImpl.Builder("node123").flagSource(flagSource).build();
     }
-
-    private static void assertRewrite(String dockerImage, String path, String expected) {
-        NodeAgentContext context = new NodeAgentContextImpl.Builder("node123")
-                .nodeSpecBuilder(ns -> ns.wantedDockerImage(DockerImage.fromString(dockerImage)))
-                .build();
-        Path actual = context.rewritePathInNodeForWantedDockerImage(Paths.get(path));
-        assertEquals(Paths.get(expected), actual);
-    }
 }