diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-10-20 13:24:41 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-10-20 15:56:36 +0200 |
| commit | 48fecb4ccef19027713c5d04d02bc91ffb136ca4 (patch) | |
| tree | a1816ca7d8d67a715a74dc4abe71513ab24965d4 | |
| parent | a6b5313558ef76c6f1b63dc7216c22b6e6382e7d (diff) | |
Always use the zone's container registry
3 files changed, 7 insertions, 3 deletions
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 a9f0a16e517..92518239258 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 @@ -62,7 +62,11 @@ public class ContainerImages { * if it is a Docker host, or default */ public DockerImage imageFor(NodeType type) { NodeType typeToUseForLookup = type.isHost() ? type.childNodeType() : type; - return getImages().getOrDefault(typeToUseForLookup, defaultImage); + DockerImage image = getImages().get(typeToUseForLookup); + if (image == null) { + return defaultImage; + } + return image.withRegistry(defaultImage.registry()); // Always use the registry configured for this zone. } /** Set the docker image for nodes of given type */ diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java index a7bb8dfe481..3d2ac1329c4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java @@ -229,7 +229,7 @@ public class NodesV2ApiTest { Utf8.toBytes("{\"modelName\": null}"), Request.Method.PATCH), "{\"message\":\"Updated dockerhost1.yahoo.com\"}"); tester.assertPartialResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com"), "modelName", false); - tester.container().handleRequest((new Request("http://localhost:8080/nodes/v2/upgrade/tenant", Utf8.toBytes("{\"dockerImage\": \"docker.domain.tld/my/image\"}"), Request.Method.PATCH))); + tester.container().handleRequest((new Request("http://localhost:8080/nodes/v2/upgrade/tenant", Utf8.toBytes("{\"dockerImage\": \"ignored-registry.example.com/my/image\"}"), Request.Method.PATCH))); ((OrchestratorMock) tester.container().components().getComponent(OrchestratorMock.class.getName())) .suspend(new HostName("host4.yahoo.com")); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json index 7ca5048ac3b..98b64e9eb25 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json @@ -24,7 +24,7 @@ }, "restartGeneration": 1, "currentRestartGeneration": 1, - "wantedDockerImage": "docker.domain.tld/my/image:6.42.0", + "wantedDockerImage": "docker-registry.domain.tld:8080/my/image:6.42.0", "wantedVespaVersion": "6.42.0", "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any" }, "allowedToBeDown": true, |