diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-10-15 09:08:46 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-10-15 09:10:33 +0200 |
commit | 287bd61eefe75550133969abb5a33c3f44662db4 (patch) | |
tree | 26078676af0c9cd6aef190c35b885d632b917f56 /node-repository/src/main | |
parent | 299e8fea68d4a0f28c365bd3ff7866f18ca290dd (diff) |
Remove stale TODO
Diffstat (limited to 'node-repository/src/main')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index 02b426ed6fc..b7b334aaba4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.restapi; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.DockerImage; -import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.serialization.NetworkPortsSerializer; @@ -166,7 +165,7 @@ class NodesResponse extends SlimeJsonResponse { if (node.type().isHost()) nodeRepository.firmwareChecks().requiredAfter().ifPresent(after -> object.setLong("wantedFirmwareCheck", after.toEpochMilli())); node.status().vespaVersion().ifPresent(version -> object.setString("vespaVersion", version.toFullString())); - currentDockerImage(node).ifPresent(dockerImage -> object.setString("currentDockerImage", dockerImage.asString())); + currentContainerImage(node).ifPresent(image -> object.setString("currentDockerImage", image.asString())); object.setLong("failCount", node.status().failCount()); object.setBool("wantToRetire", node.status().wantToRetire()); object.setBool("preferToRetire", node.status().preferToRetire()); @@ -206,14 +205,15 @@ class NodesResponse extends SlimeJsonResponse { } } - // Hack: For non-docker nodes, return current docker image as default prefix + current Vespa version - // TODO: Remove current + wanted docker image from response for non-docker types - private Optional<DockerImage> currentDockerImage(Node node) { - return node.status().containerImage() - .or(() -> Optional.of(node) - .filter(n -> n.flavor().getType() != Flavor.Type.DOCKER_CONTAINER) - .flatMap(n -> n.status().vespaVersion() - .map(version -> nodeRepository.containerImages().get(n).withTag(version)))); + private Optional<DockerImage> currentContainerImage(Node node) { + if (node.status().containerImage().isPresent()) { + return node.status().containerImage(); + } + if (node.type().isHost()) { + // Return the image used by children of this host. This is used by host-admin to preload container images. + return node.status().vespaVersion().map(version -> nodeRepository.containerImages().get(node).withTag(version)); + } + return Optional.empty(); } private void ipAddressesToSlime(Set<String> ipAddresses, Cursor array) { |