diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-10-21 09:36:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-21 09:36:57 +0200 |
commit | b4bcee8ca30b1d03892af747057dbb5de83fa1b8 (patch) | |
tree | 84121c182b479c0c6270a65d2c741106306ef44a /configserver | |
parent | 5462aa495dfcfb5398666f16750917f4bd90a939 (diff) | |
parent | f46523b4187f6193749d7aef3edaf621341f3f4f (diff) |
Merge pull request #14969 from vespa-engine/mpolden/container-registry
Let zone decide container registry
Diffstat (limited to 'configserver')
3 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index 2b3d3c3649a..74d123341f6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -205,7 +205,7 @@ public class SessionZooKeeperClient { } public void writeDockerImageRepository(Optional<DockerImage> dockerImageRepository) { - dockerImageRepository.ifPresent(repo -> configCurator.putData(dockerImageRepositoryPath(), repo.repository())); + dockerImageRepository.ifPresent(repo -> configCurator.putData(dockerImageRepositoryPath(), repo.untagged())); } public Instant readCreateTime() { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index 8860da1dca4..3af408b90f6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -293,7 +293,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { @Test public void test_docker_image_repository() { long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app); - String dockerImageRepository = "https://foo.bar.com:4443/baz"; + String dockerImageRepository = "foo.bar.com:4443/baz"; request(HttpRequest.Method.PUT, sessionId, Map.of("dockerImageRepository", dockerImageRepository, "applicationName", applicationId().application().value())); applicationRepository.activate(tenantRepository.getTenant(tenant), sessionId, timeoutBudget, false); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java index 2ac3785682c..d8f818f19d9 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java @@ -51,7 +51,7 @@ public class ZKApplicationPackageTest { ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))), Optional.of(Version.fromString("6.0.1")), Optional.empty(), - Optional.of(DockerImage.fromString("docker repo"))))); + Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))))); private ConfigCurator configCurator; |