diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-08-18 17:36:40 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2022-08-18 17:36:40 +0200 |
commit | 1bb270615cced38add94db2e51b28346a12a507f (patch) | |
tree | fa2a23738efca1d855e46e937ba9e289c1af4520 /node-repository | |
parent | b679206de2431f11e52e6734abfcaefa40554037 (diff) |
Drop override of Vespa version
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java | 4 |
1 files changed, 1 insertions, 3 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 2ecf73a645b..309280c8f15 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 @@ -53,7 +53,6 @@ class NodesResponse extends SlimeJsonResponse { private final Function<HostName, Optional<HostInfo>> orchestrator; private final NodeRepository nodeRepository; private final StringFlag wantedDockerTagFlag; - private final StringFlag wantedVespaVersionFlag; public NodesResponse(ResponseType responseType, HttpRequest request, Orchestrator orchestrator, NodeRepository nodeRepository) { @@ -64,7 +63,6 @@ class NodesResponse extends SlimeJsonResponse { this.orchestrator = orchestrator.getHostResolver(); this.nodeRepository = nodeRepository; this.wantedDockerTagFlag = PermanentFlags.WANTED_DOCKER_TAG.bindTo(nodeRepository.flagSource()); - this.wantedVespaVersionFlag = PermanentFlags.WANTED_VESPA_VERSION.bindTo(nodeRepository.flagSource()); Cursor root = slime.setObject(); switch (responseType) { @@ -156,7 +154,7 @@ class NodesResponse extends SlimeJsonResponse { object.setLong("restartGeneration", allocation.restartGeneration().wanted()); object.setLong("currentRestartGeneration", allocation.restartGeneration().current()); object.setString("wantedDockerImage", nodeRepository.containerImages().get(node).withTag(resolveVersionFlag(wantedDockerTagFlag, node, allocation)).asString()); - object.setString("wantedVespaVersion", resolveVersionFlag(wantedVespaVersionFlag, node, allocation).toFullString()); + object.setString("wantedVespaVersion", allocation.membership().cluster().vespaVersion().toFullString()); NodeResourcesSerializer.toSlime(allocation.requestedResources(), object.setObject("requestedResources")); allocation.networkPorts().ifPresent(ports -> NetworkPortsSerializer.toSlime(ports, object.setArray("networkPorts"))); orchestrator.apply(new HostName(node.hostname())) |