diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-12-07 10:29:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 10:29:17 +0100 |
| commit | 1f2fdd9cd8ca472d4b2460fe6d1d2cbaeff2f6e1 (patch) | |
| tree | 65efc54dfa792231cec81fb16c44fe593e875de9 | |
| parent | 83114f71b32dc468dc7461963cc67dfb0ce0dea9 (diff) | |
| parent | 9f1903169c46c1ab145c3e111e7809565a1873cf (diff) | |
Merge pull request #25139 from vespa-engine/jonmv/pinned-in-deployment-apiv8.96.6
Add "pinned" to deployment API response
2 files changed, 6 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java index 999cf63abf6..9c529230a7f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java @@ -169,6 +169,7 @@ public class DeploymentApiHandler extends ThreadedHttpRequestHandler { instanceObject.setString("application", instance.application().value()); instanceObject.setString("instance", instance.instance().value()); instanceObject.setBool("upgrading", status.application().require(instance.instance()).change().platform().equals(Optional.of(statistics.version()))); + instanceObject.setBool("pinned", status.application().require(instance.instance()).change().isPinned()); DeploymentStatus.StepStatus stepStatus = status.instanceSteps().get(instance.instance()); if (stepStatus != null) { // Instance may not have any steps, i.e. an empty deployment spec has been submitted stepStatus.blockedUntil(Change.of(statistics.version())) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json index 864fb628e92..51398daa1d4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json @@ -36,6 +36,7 @@ "application": "application1", "instance": "default", "upgrading": false, + "pinned": false, "upgradePolicy": "default", "compileVersion": "6.1.0", "jobs": [ @@ -77,6 +78,7 @@ "application": "application2", "instance": "i2", "upgrading": false, + "pinned": false, "upgradePolicy": "default", "compileVersion": "6.1.0", "jobs": [ @@ -185,6 +187,7 @@ "application": "application1", "instance": "default", "upgrading": true, + "pinned": false, "upgradePolicy": "default", "compileVersion": "6.1.0", "jobs": [ @@ -265,6 +268,7 @@ "application": "application2", "instance": "i1", "upgrading": false, + "pinned": false, "upgradePolicy": "default", "compileVersion": "6.1.0", "jobs": [ @@ -324,6 +328,7 @@ "application": "application2", "instance": "i2", "upgrading": true, + "pinned": false, "upgradePolicy": "default", "compileVersion": "6.1.0", "jobs": [ |