summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-09-23 10:24:30 +0200
committerGitHub <noreply@github.com>2022-09-23 10:24:30 +0200
commit1495833778d14232f77b71608af9ea8039e7863c (patch)
tree6c11e04665d48debf1ad22bffbcee739f62cb5ae /controller-server
parent10893f13becd413ed49bcac080670a1afac5f86f (diff)
parenta455fac15db74a985bfc77cb774760d07a804653 (diff)
Merge pull request #24194 from vespa-engine/jonmv/allow-operator-to-set-unknown-platform-target
Allow operator to set platform upgrade to unknown version
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java2
1 files changed, 1 insertions, 1 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 e12cd169499..10bf0d2aa4f 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
@@ -2061,7 +2061,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
VersionStatus versionStatus = controller.readVersionStatus();
if (version.equals(Version.emptyVersion))
version = controller.systemVersion(versionStatus);
- if (!versionStatus.isActive(version))
+ if ( ! versionStatus.isActive(version) && ! isOperator(request))
throw new IllegalArgumentException("Cannot trigger deployment of version '" + version + "': " +
"Version is not active in this system. " +
"Active versions: " + versionStatus.versions()