Merge pull request #19696 from vespa-engine/arnej/no-more-require-connectivity-disabling

Arnej/no more require connectivity disabling

1 files changed, 0 insertions, 12 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
index 2eb8a6e319b..c86cda0bbd1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
@@ -19,7 +19,6 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr
 
     private final ApplicationId applicationId;
     private final Zone zone;
-    private final boolean requireConnectivityCheck;
 
     /**
      * Constructs a new ConfigSentinel for the given host.
@@ -32,7 +31,6 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr
         super(host, "sentinel");
         this.applicationId = applicationId;
         this.zone = zone;
-        this.requireConnectivityCheck = featureFlags.requireConnectivityCheck();
         portsMeta.on(0).tag("rpc").tag("admin");
         portsMeta.on(1).tag("telnet").tag("interactive").tag("http").tag("state");
         setProp("clustertype", "hosts");
@@ -80,16 +78,6 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr
                 builder.service(getServiceConfig(s));
             }
         }
-        builder.connectivity(getConnectivityConfig(requireConnectivityCheck));
-    }
-
-    private SentinelConfig.Connectivity.Builder getConnectivityConfig(boolean enable) {
-        var builder = new SentinelConfig.Connectivity.Builder();
-        if (! enable) {
-            builder.minOkPercent(0);
-            builder.maxBadCount(Integer.MAX_VALUE);
-        }
-        return builder;
     }
 
     private SentinelConfig.Application.Builder getApplicationConfig() {