Remove unused fields

6 files changed, 4 insertions, 52 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 62828b314d0..8cdf9ba4977 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -135,12 +135,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.numParallelTenantLoaders().isPresent()) {
             builder.numParallelTenantLoaders(options.numParallelTenantLoaders().get());
         }
-        if (options.dockerRegistry().isPresent()) {
-            builder.dockerRegistry(options.dockerRegistry().get());
-        }
-        if (options.dockerVespaBaseImage().isPresent()) {
-            builder.dockerVespaBaseImage(options.dockerVespaBaseImage().get());
-        }
         if (options.loadBalancerAddress().isPresent()) {
             builder.loadBalancerAddress(options.loadBalancerAddress().get());
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index 0ebd3987ba4..9dbbdfb7696 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -41,7 +41,5 @@ public interface CloudConfigOptions {
     Optional<String> defaultContentFlavor();
     Optional<Boolean> useVespaVersionInRequest();
     Optional<Integer> numParallelTenantLoaders();
-    Optional<String> dockerRegistry();
-    Optional<String> dockerVespaBaseImage();
     Optional<String> loadBalancerAddress();
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index c698e9f5079..8db253240cf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -109,12 +109,6 @@ public class TestOptions implements CloudConfigOptions {
     public Optional<Integer> numParallelTenantLoaders() { return numParallelTenantLoaders; }
 
     @Override
-    public Optional<String> dockerRegistry() { return Optional.empty(); }
-
-    @Override
-    public Optional<String> dockerVespaBaseImage() { return Optional.empty(); }
-
-    @Override
     public Optional<String> loadBalancerAddress() { return Optional.empty(); }
 
     public TestOptions numParallelTenantLoaders(int numLoaders) {
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def
index 494dae8b086..f730758d58f 100644
--- a/configdefinitions/src/vespa/configserver.def
+++ b/configdefinitions/src/vespa/configserver.def
@@ -43,10 +43,6 @@ maxoutputbuffersize int default=65536
 useVespaVersionInRequest bool default=false
 payloadCompressionType enum { UNCOMPRESSED, LZ4 } default=LZ4
 
-# Docker config
-dockerRegistry string default=""
-dockerVespaBaseImage string default=""
-
 # Athenz config
 loadBalancerAddress string default=""
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
index e4b498242c1..bd9c6476ad6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
@@ -7,10 +7,8 @@ import com.yahoo.config.model.api.ModelFactory;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Version;
 import com.yahoo.test.ManualClock;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -26,11 +24,8 @@ import static org.junit.Assert.fail;
  */
 public class HostedDeployTest {
 
-    private static final String dockerRegistry = "foo.com:4443";
-    private static final String dockerVespaBaseImage = "/vespa/ci";
-
     @Test
-    public void testRedeployWithVersion() throws InterruptedException, IOException {
+    public void testRedeployWithVersion() {
         DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
         tester.deployApp("myApp", "4.5.6", Instant.now());
 
@@ -42,7 +37,7 @@ public class HostedDeployTest {
     }
 
     @Test
-    public void testRedeploy() throws InterruptedException, IOException {
+    public void testRedeploy() {
         DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
         tester.deployApp("myApp", Instant.now());
 
@@ -53,7 +48,7 @@ public class HostedDeployTest {
     }
 
     @Test
-    public void testDeployMultipleVersions() throws InterruptedException, IOException {
+    public void testDeployMultipleVersions() {
         ManualClock clock = new ManualClock("2016-10-09T00:00:00");
         List<ModelFactory> modelFactories = new ArrayList<>();
         modelFactories.add(DeployTester.createModelFactory(Version.fromString("6.1.0"), clock));
@@ -65,7 +60,7 @@ public class HostedDeployTest {
     }
 
     @Test
-    public void testRedeployAfterExpiredValidationOverride() throws InterruptedException, IOException {
+    public void testRedeployAfterExpiredValidationOverride() {
         // Old version of model fails, but application disables loading old models until 2016-10-10, so deployment works
         ManualClock clock = new ManualClock("2016-10-09T00:00:00");
         List<ModelFactory> modelFactories = new ArrayList<>();
@@ -104,33 +99,10 @@ public class HostedDeployTest {
         }
     }
 
-    @Test
-    @Ignore //WIP
-    public void testDeployWithDockerImage() throws InterruptedException, IOException {
-        final String vespaVersion = "6.51.1";
-        DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
-        ApplicationId applicationId = tester.deployApp("myApp", vespaVersion, Instant.now());
-        assertAllocatedHosts(vespaVersion, tester, applicationId);
-
-        System.out.println("Redeploy");
-        Optional<com.yahoo.config.provision.Deployment> deployment = tester.redeployFromLocalActive();
-        assertTrue(deployment.isPresent());
-        deployment.get().prepare();
-        deployment.get().activate();
-        //assertAllocatedHosts(vespaVersion, tester, applicationId);
-    }
-
-    private void assertAllocatedHosts(String vespaVersion, DeployTester tester, ApplicationId applicationId) {
-        tester.getAllocatedHostsOf(applicationId).getHosts().stream()
-              .forEach(h -> assertEquals(vespaVersion, h.membership().get().cluster().vespaVersion()));
-    }
-
     private static ConfigserverConfig createConfigserverConfig() {
         return new ConfigserverConfig(new ConfigserverConfig.Builder()
                                               .configServerDBDir(Files.createTempDir().getAbsolutePath())
                                               .configDefinitionsDir(Files.createTempDir().getAbsolutePath())
-                                              .dockerRegistry(dockerRegistry)
-                                              .dockerVespaBaseImage(dockerVespaBaseImage)
                                               .hostedVespa(true)
                                               .multitenant(true));
     }
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigInstallVariables.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigInstallVariables.scala
index 8cfa01937c9..363a1f6249c 100644
--- a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigInstallVariables.scala
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigInstallVariables.scala
@@ -36,8 +36,6 @@ class CloudConfigInstallVariables extends CloudConfigOptions {
   override val useVespaVersionInRequest = optionalInstallVar[java.lang.Boolean]("use_vespa_version_in_request")
   override val hostedVespa = optionalInstallVar[java.lang.Boolean]("hosted_vespa")
   override val numParallelTenantLoaders = optionalInstallVar[java.lang.Integer]("num_parallel_tenant_loaders")
-  override val dockerRegistry = optionalInstallVar[java.lang.String]("docker_registry")
-  override val dockerVespaBaseImage = optionalInstallVar[java.lang.String]("docker_vespa_base_image")
   override val loadBalancerAddress = optionalInstallVar[java.lang.String]("load_balancer_address")
 }