Use config to specify Docker image in node-repository

4 files changed, 9 insertions, 11 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 19fcce4b965..b7c942168d6 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -37,10 +37,6 @@ public final class ClusterSpec {
 
     public Version vespaVersion() { return vespaVersion; }
 
-    public String dockerImage() {
-        return DockerImage.defaultImage.withTag(vespaVersion).toString();
-    }
-
     /** Returns the group within the cluster this specifies, or empty to specify the whole cluster */
     public Optional<Group> group() { return groupId; }
 
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java b/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java
index 2c6c9d82419..ba60e42e7d6 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java
@@ -10,8 +10,6 @@ import com.yahoo.component.Version;
  */
 public class DockerImage {
 
-    public static final DockerImage defaultImage = new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci");
-
     private final String name;
 
     public DockerImage(String name) {
@@ -20,9 +18,9 @@ public class DockerImage {
 
     /** Get Docker image tag as version */
     public Version tagAsVersion() {
-        String[] parts = toString().split(":");
+        String[] parts = asString().split(":");
         if (parts.length < 2) {
-            throw new IllegalArgumentException("Could not parse tag from Docker image '" + toString() + "'");
+            throw new IllegalArgumentException("Could not parse tag from Docker image '" + asString() + "'");
         }
         return Version.fromString(parts[parts.length - 1]);
     }
@@ -32,8 +30,8 @@ public class DockerImage {
         return new DockerImage(name + ":" + version.toFullString());
     }
 
-    @Override
-    public String toString() {
+    public String asString() {
         return name;
     }
+
 }
diff --git a/config-provisioning/src/main/resources/configdefinitions/node-repository.def b/config-provisioning/src/main/resources/configdefinitions/node-repository.def
new file mode 100644
index 00000000000..872f2e50f9c
--- /dev/null
+++ b/config-provisioning/src/main/resources/configdefinitions/node-repository.def
@@ -0,0 +1,5 @@
+namespace=config.provisioning
+
+# Docker image to use in REST API responses. This must be a fully qualified name, including registry, but excluding
+# version. Example: my-docker-registry.domain.tld:8080/dist/vespa
+dockerImage string
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
index bd691afaf55..b4726022ebb 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
@@ -54,7 +54,6 @@ public class ProvisionInfoTest {
         assertTrue(!getHost(h1.hostname(), serializedInfo.getHosts()).membership().isPresent());
         assertEquals("container/test/0", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().stringValue());
         assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().vespaVersion());
-        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.73.1", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage());
     }
 
     private HostSpec getHost(String hostname, Set<HostSpec> hosts) {