Cleanup use of restartOnDeployWhenOnnxModelChanges

Should always be true, simplify

3 files changed, 2 insertions, 12 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index b088231e84a..a6429c43d0e 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -84,7 +84,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private List<DataplaneToken> dataplaneTokens;
     private int contentLayerMetadataFeatureLevel = 0;
     private boolean dynamicHeapSize = false;
-    private boolean restartOnDeployWhenOnnxModelChanges = false;
 
     @Override public ModelContext.FeatureFlags featureFlags() { return this; }
     @Override public boolean multitenant() { return multitenant; }
@@ -142,7 +141,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public List<DataplaneToken> dataplaneTokens() { return dataplaneTokens; }
     @Override public int contentLayerMetadataFeatureLevel() { return contentLayerMetadataFeatureLevel; }
     @Override public boolean dynamicHeapSize() { return dynamicHeapSize; }
-    @Override public boolean restartOnDeployWhenOnnxModelChanges() { return restartOnDeployWhenOnnxModelChanges; }
 
     public TestProperties sharedStringRepoNoReclaim(boolean sharedStringRepoNoReclaim) {
         this.sharedStringRepoNoReclaim = sharedStringRepoNoReclaim;
@@ -375,11 +373,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
 
     public TestProperties setDynamicHeapSize(boolean b) { this.dynamicHeapSize = b; return this; }
 
-    public TestProperties setRestartOnDeployForOnnxModelChanges(boolean enable) {
-        this.restartOnDeployWhenOnnxModelChanges = enable;
-        return this;
-    }
-
     public static class Spec implements ConfigServerSpec {
 
         private final String hostName;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
index b809f36a436..008a3fc5547 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
@@ -35,8 +35,7 @@ public class RestartOnDeployForOnnxModelChangesValidator implements ChangeValida
 
     @Override
     public void validate(ChangeContext context) {
-        if ( ! context.deployState().featureFlags().restartOnDeployWhenOnnxModelChanges()
-                || ! context.deployState().isHosted()) return;
+        if ( ! context.deployState().isHosted()) return;
 
         // Compare onnx models used by each cluster and set restart on deploy for cluster if estimated cost,
         // model hash or model options have changed
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java
index 92c7fffd72f..4c0786ea879 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java
@@ -218,9 +218,7 @@ public class RestartOnDeployForOnnxModelChangesValidatorTest {
 
     private static DeployState.Builder deployStateBuilder(boolean hosted) {
         var builder = new DeployState.Builder()
-                .properties((new TestProperties())
-                                    .setRestartOnDeployForOnnxModelChanges(true)
-                                    .setHostedVespa(hosted));
+                .properties((new TestProperties()).setHostedVespa(hosted));
         if (hosted)
             builder.endpoints(Set.of(new ContainerEndpoint("cluster1", ApplicationClusterEndpoint.Scope.zone, List.of("tc.example.com"))))
                     .modelHostProvisioner(new InMemoryProvisioner(5, new NodeResources(1, 2, 25, 0.3), true));