diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-07-10 16:44:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-10 16:44:20 +0200 |
commit | 51b8ebeeee268fc51c78530aa9c0daef50b945fc (patch) | |
tree | 7126452452b9bc33629bbb150f3e022235db26d8 | |
parent | b802eb3ea5a8058daaaaecb3bfef3524c102799b (diff) | |
parent | 62c84eb101b75cdc1891896c5ebc3fd38b65b0aa (diff) |
Merge pull request #27729 from vespa-engine/jonmv/fall-back-to-system-version
Fall back to system, rathern than controller, version for current major
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java index 0d8e7745f65..186e6838a71 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java @@ -85,10 +85,7 @@ public class ApplicationPackageValidator { private void validateDeprecatedElements(ApplicationPackage applicationPackage) { int wantedMajor = applicationPackage.compileVersion().map(Version::getMajor) .or(() -> applicationPackage.deploymentSpec().majorVersion()) - .or(() -> controller.readVersionStatus().controllerVersion() - .map(VespaVersion::versionNumber) - .map(Version::getMajor)) - .orElseThrow(() -> new IllegalArgumentException("Could not determine wanted major version")); + .orElseGet(() -> controller.readSystemVersion().getMajor()); for (var deprecatedElement : applicationPackage.deploymentSpec().deprecatedElements()) { if (deprecatedElement.majorVersion() >= wantedMajor) continue; throw new IllegalArgumentException(deprecatedElement.humanReadableString()); |