Go back to using cluster spec without docker image repo for infra apps

5 files changed, 6 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
index 73d57b8b53b..1086a3a7cd9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
@@ -88,7 +88,7 @@ public class InfraDeployerImpl implements InfraDeployer {
                 Version targetVersion = infrastructureVersions.getTargetVersionFor(nodeType);
                 hostSpecs = provisioner.prepare(
                         application.getApplicationId(),
-                        application.getClusterSpecWithVersion(targetVersion, Optional.empty()), // TODO: Use dockerImageRepo from zk
+                        application.getClusterSpecWithVersion(targetVersion),
                         application.getCapacity(),
                         1, // groups
                         logger::log);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
index d7916c0f666..48bd091011e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
@@ -138,7 +138,7 @@ public class InfraDeployerImplTest {
     private Node addNode(int id, Node.State state, Optional<Version> wantedVespaVersion) {
         Node node = tester.addNode("id-" + id, "node-" + id, "default", nodeType);
         Optional<Node> nodeWithAllocation = wantedVespaVersion.map(version -> {
-            ClusterSpec clusterSpec = application.getClusterSpecWithVersion(version, Optional.empty()).with(Optional.of(ClusterSpec.Group.from(0)));
+            ClusterSpec clusterSpec = application.getClusterSpecWithVersion(version).with(Optional.of(ClusterSpec.Group.from(0)));
             ClusterMembership membership = ClusterMembership.from(clusterSpec, 1);
             Allocation allocation = new Allocation(application.getApplicationId(), membership, node.flavor().resources(), Generation.initial(), false);
             return node.with(allocation);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index 83fd64a18f7..78b4ccbd868 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -336,7 +336,7 @@ public class ProvisioningTester {
         ConfigServerApplication application = new ConfigServerApplication();
         List<HostSpec> hosts = prepare(
                 application.getApplicationId(),
-                application.getClusterSpecWithVersion(configServersVersion, Optional.empty()),
+                application.getClusterSpecWithVersion(configServersVersion),
                 application.getCapacity(),
                 1);
         activate(application.getApplicationId(), new HashSet<>(hosts));
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
index fa5c634fdac..64cf4f6f26f 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
@@ -74,8 +74,8 @@ public abstract class InfraApplication implements InfraApplicationApi {
     }
 
     @Override
-    public ClusterSpec getClusterSpecWithVersion(Version version, Optional<String> dockerImageRepo) {
-        return ClusterSpec.request(clusterSpecType, clusterSpecId, version, true, Optional.empty(), dockerImageRepo);
+    public ClusterSpec getClusterSpecWithVersion(Version version) {
+        return ClusterSpec.request(clusterSpecType, clusterSpecId, version, true, Optional.empty(), Optional.empty());
     }
 
     public ClusterSpec.Type getClusterSpecType() {
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/InfraApplicationApi.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/InfraApplicationApi.java
index 98ba682280f..b4b61682a33 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/InfraApplicationApi.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/InfraApplicationApi.java
@@ -16,5 +16,5 @@ import java.util.Optional;
 public interface InfraApplicationApi {
     ApplicationId getApplicationId();
     Capacity getCapacity();
-    ClusterSpec getClusterSpecWithVersion(Version version, Optional<String> dockerImageRepo);
+    ClusterSpec getClusterSpecWithVersion(Version version);
 }