diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-10-14 08:57:50 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-10-14 08:57:50 +0200 |
commit | fa0a86f6eaf5f219e3b1a6c7cbf4c064d6b0ffa6 (patch) | |
tree | 1681281d4e8920e417c4e212bf093132e3e58e55 /node-repository | |
parent | adad7cc066e7debe8137737a8ce9c6ce377a2c1a (diff) |
Remove unused image replacement logic
Diffstat (limited to 'node-repository')
3 files changed, 2 insertions, 30 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index d2287d32dec..67de210127d 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -79,8 +79,7 @@ public class NodeRepository extends AbstractComponent { Clock.systemUTC(), zone, new DnsNameResolver(), - DockerImage.fromString(config.containerImage()) - .withReplacedBy(DockerImage.fromString(config.containerImageReplacement())), + DockerImage.fromString(config.containerImage()), flagSource, metricsDb, config.useCuratorClientCache(), diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java index a788b1855d8..cd9303d7f6e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java @@ -72,11 +72,7 @@ public class ContainerImages { /** Rewrite the registry part of given image, using this zone's default image */ private DockerImage rewriteRegistry(DockerImage image) { - DockerImage zoneImage = defaultImage; - if (zoneImage.replacedBy().isPresent()) { - zoneImage = zoneImage.replacedBy().get(); - } - return image.withRegistry(zoneImage.registry()); + return image.withRegistry(defaultImage.registry()); } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java index 7b84b7a31f3..6f624ade97d 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java @@ -48,27 +48,4 @@ public class ContainerImagesTest { } } - @Test - public void image_replacement() { - var flagSource = new InMemoryFlagSource(); - var defaultImage = DockerImage.fromString("foo.example.com/vespa/vespa"); - var tester = new ProvisioningTester.Builder().defaultImage(defaultImage).flagSource(flagSource).build(); - var hosts = tester.makeReadyNodes(2, "default", NodeType.host); - tester.activateTenantHosts(); - - // Default image is used when there is no replacement - for (var host : hosts) { - assertEquals(defaultImage, tester.nodeRepository().containerImages().imageFor(host.type())); - } - - // Replacement image is preferred - DockerImage imageWithReplacement = defaultImage.withReplacedBy(DockerImage.fromString("bar.example.com/vespa/vespa")); - tester = new ProvisioningTester.Builder().defaultImage(imageWithReplacement).flagSource(flagSource).build(); - hosts = tester.makeReadyNodes(2, "default", NodeType.host); - for (var host : hosts) { - assertEquals(imageWithReplacement.replacedBy().get().asString(), - tester.nodeRepository().containerImages().imageFor(host.type()).asString()); - } - } - } |