diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-03-03 18:04:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 18:04:57 +0100 |
| commit | 83365228de77180f6cde0ed9d9773401fb1a4219 (patch) | |
| tree | 41f0032dae15b5a4c586da37f208b4281ea907df /service-monitor | |
| parent | 43e913e359f918496d672a5bdadb5fce040b2fc0 (diff) | |
| parent | f3a5ff31d84a112e29680b0c59ec03a815d06b5e (diff) | |
Merge pull request #12398 from vespa-engine/mpolden/combined-id
Always use container cluster ID as cluster ID for load balancers
Diffstat (limited to 'service-monitor')
| -rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java index 09140423010..7b79adf89d0 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -74,7 +75,7 @@ public abstract class InfraApplication implements InfraApplicationApi { @Override public ClusterSpec getClusterSpecWithVersion(Version version) { - return ClusterSpec.request(clusterSpecType, clusterSpecId, version, true); + return ClusterSpec.request(clusterSpecType, clusterSpecId, version, true, Optional.empty()); } public ClusterSpec.Type getClusterSpecType() { |