Merge pull request #27729 from vespa-engine/jonmv/fall-back-to-system-version

Fall back to system, rathern than controller, version for current major

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());