summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-04-24 11:39:19 +0200
committerHarald Musum <musum@verizonmedia.com>2020-04-24 11:39:19 +0200
commit4a4b2a8e0fe79114d9e9508df2ebdd663c44e32c (patch)
treebe2b7338ef5ac94ac92c042c51a7184c671e21d0 /controller-server/src/main
parent2319fe6f00fe0e1891f26f919de3ec9796752a2c (diff)
Only print docker image if wanted is not the same as current
Diffstat (limited to 'controller-server/src/main')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 353b82ede49..bc206011bb1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -554,7 +554,9 @@ public class InternalStepRunner implements StepRunner {
}
private String currentPlatform(Node node) {
- return node.wantedDockerImage().repository() + ":" + node.wantedVersion();
+ String currentRepo = node.currentDockerImage().repository();
+ String wantedRepo = node.wantedDockerImage().repository();
+ return (currentRepo.equals(wantedRepo) ? "" : currentRepo + ":") + node.currentVersion();
}
private String humanize(Node.ServiceState state) {