diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-03-19 17:51:13 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-03-19 17:51:13 +0100 |
| commit | a681535b066cfc7c08d54603b811da8e0472736d (patch) | |
| tree | 10882530fda6e5556c0c4eb18a8542a03661ba97 /config-provisioning | |
| parent | 1760ca738f4d0d463535299ba64a06f50811c3b1 (diff) | |
Fixes after code review
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 46ece153986..853fe4b11ed 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -288,6 +288,7 @@ "public com.yahoo.config.provision.ClusterSpec$Type type()", "public com.yahoo.config.provision.ClusterSpec$Id id()", "public java.util.Optional dockerImageRepo()", + "public java.util.Optional dockerImage()", "public com.yahoo.component.Version vespaVersion()", "public java.util.Optional group()", "public java.util.Optional combinedId()", diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java index 21d6a226b18..66a2ff411fe 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java @@ -48,6 +48,9 @@ public final class ClusterSpec { /** Returns the docker image repository part of a docker image we want this cluster to run */ public Optional<String> dockerImageRepo() { return dockerImageRepo; } + /** Returns the docker image (repository + vespa version) we want this cluster to run */ + public Optional<String> dockerImage() { return dockerImageRepo.map(repo -> repo + ":" + vespaVersion.toFullString()); } + /** Returns the version of Vespa that we want this cluster to run */ public Version vespaVersion() { return vespaVersion; } |