diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-10-14 13:11:28 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-10-14 13:11:28 +0200 |
| commit | b191f05fcc49226c4080cea042bf45579755c67f (patch) | |
| tree | 1d3ba616bcae6ef2b3068b7dba8f272ef599b92f /controller-server/src | |
| parent | 12e06ccac5c4758ea505d80db2866d2b0420cf45 (diff) | |
Make sure we don't send quota budget to older apps
Diffstat (limited to 'controller-server/src')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 7 |
1 files changed, 7 insertions, 0 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 f5a04d971a0..757b49836af 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 @@ -537,6 +537,13 @@ public class ApplicationController { Optional<Quota> quota = billingController.getQuota(application.tenant(), zone.environment()); + if (platform.isBefore(Version.fromString("7.299"))) { + // there is a bug in the configuration model that makes the QuotaValidator fail if the budget + // parameter is used. make sure we don't send budget to deployments with these old versions. + // TODO: Remove once < 7.299 is no longer deployed in public and publiccd + quota = quota.map(Quota::withoutBudget); + } + if (zone.environment().isManuallyDeployed()) controller.applications().applicationStore().putMeta(new DeploymentId(application, zone), clock.instant(), |