diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-11-22 09:14:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-22 09:14:20 +0100 |
commit | 5320f639fa47dbf2e200476d572e8b82d0b74632 (patch) | |
tree | 0b0bd65feeb48af9ddd81867ddeb526269d02ce9 | |
parent | 7226465dfa8487cd507df1246b061f6a34283691 (diff) | |
parent | f447fe438222958a630fe4c92df7ff06b22b92b6 (diff) |
Merge pull request #20115 from vespa-engine/jonmv/dummy-dev-deployments
Add dummy deploymenst for running dev/perf deployments too
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 5cd5a70e4a4..d9f0358e3b5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1292,18 +1292,22 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { request.getUri()).toString()); } } - // Add dummy values for not-yet-existent prod deployments. - status.jobSteps().keySet().stream() - .filter(job -> job.application().instance().equals(instance.name())) - .filter(job -> job.type().isProduction() && job.type().isDeployment()) + // Add dummy values for not-yet-existent prod deployments, and running dev/perf deployments. + Stream.concat(status.jobSteps().keySet().stream() + .filter(job -> job.application().instance().equals(instance.name())) + .filter(job -> job.type().isProduction() && job.type().isDeployment()), + controller.jobController().active(instance.id()).stream() + .map(run -> run.id().job()) + .filter(job -> job.type().environment().isManuallyDeployed())) .map(job -> job.type().zone(controller.system())) .filter(zone -> ! instance.deployments().containsKey(zone)) .forEach(zone -> { - Cursor deploymentObject = instancesArray.addObject(); - deploymentObject.setString("environment", zone.environment().value()); - deploymentObject.setString("region", zone.region().value()); + Cursor deploymentObject = instancesArray.addObject(); + deploymentObject.setString("environment", zone.environment().value()); + deploymentObject.setString("region", zone.region().value()); }); + // TODO jonmv: Remove when clients are updated application.deployKeys().stream().findFirst().ifPresent(key -> object.setString("pemDeployKey", KeyUtils.toPem(key))); |