diff options
Diffstat (limited to 'controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java index 5dba40f249c..05e9707473c 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.configserver; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; @@ -122,7 +123,9 @@ public interface NodeRepository { clusterTypeOf(node.getMembership()), node.getWantToRetire(), node.getWantToDeprovision(), - Optional.ofNullable(node.getReservedTo()).map(TenantName::from)); + Optional.ofNullable(node.getReservedTo()).map(TenantName::from), + dockerImageFrom(node.getWantedDockerImage()), + dockerImageFrom(node.getCurrentDockerImage())); } private static String clusterIdOf(NodeMembership nodeMembership) { @@ -205,4 +208,8 @@ public interface NodeRepository { return s == null ? Version.emptyVersion : Version.fromString(s); } + private static DockerImage dockerImageFrom(String s) { + return s == null ? DockerImage.EMPTY : DockerImage.fromString(s); + } + } |