diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-12-02 08:40:57 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-12-02 08:40:57 +0100 |
| commit | 7adc4051326cb29a2dfcfa4e034451aae8ee8118 (patch) | |
| tree | 086de6d2c5c86f37501655abf18d89bbd6ccfd9a /controller-server | |
| parent | b127005594b314a5fa5ffddcd458de80ca240eef (diff) | |
Restore public API for old ContainerModelBuilder
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index d3505b31d8f..72e2f073453 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -614,7 +614,7 @@ public class ApplicationController { .map(Deployment::zone) .filter(zone -> deploymentSpec.instance(instance).isEmpty() || ! deploymentSpec.requireInstance(instance).deploysTo(zone.environment(), - Optional.of(zone.region()))) + zone.region())) .collect(Collectors.toList()); if (deploymentsToRemove.isEmpty()) @@ -645,7 +645,7 @@ public class ApplicationController { ZoneId zone = job.zone(controller.system()); if (deploymentSpec.instance(instance.name()) // TODO jonmv: Properly convert to job here. - .map(spec -> spec.deploysTo(zone.environment(), Optional.of(zone.region()))) + .map(spec -> spec.deploysTo(zone.environment(), zone.region())) .orElse(false)) continue; instance = instance.withoutDeploymentJob(job); |