Merge pull request #29286 from vespa-engine/freva/remove-flag

Remove unused flag min-exclusive-advertised-memory-gb

2 files changed, 2 insertions, 20 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index d701a35c2ef..06530fdc962 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -14,12 +14,10 @@ import java.util.TreeMap;
 import java.util.function.Predicate;
 
 import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.INSTANCE_ID;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.CLOUD_ACCOUNT;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_ID;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_TYPE;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.CONSOLE_USER_EMAIL;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME;
+import static com.yahoo.vespa.flags.FetchVector.Dimension.INSTANCE_ID;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.NODE_TYPE;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.TENANT_ID;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.VESPA_VERSION;
@@ -374,13 +372,6 @@ public class Flags {
             "Takes effect on next host provisioning / run of host-admin",
             HOSTNAME, CLOUD_ACCOUNT);
 
-    public static final UnboundIntFlag MIN_EXCLUSIVE_ADVERTISED_MEMORY_GB = defineIntFlag(
-            "min-exclusive-advertised-memory-gb", 8,
-            List.of("freva"), "2023-09-08", "2024-01-15",
-            "Minimum amount of advertised memory for exclusive nodes",
-            "Takes effect immediately",
-            INSTANCE_ID, CLUSTER_ID, CLUSTER_TYPE);
-
     public static final UnboundIntFlag CONTENT_LAYER_METADATA_FEATURE_LEVEL = defineIntFlag(
             "content-layer-metadata-feature-level", 0,
             List.of("vekterli"), "2022-09-12", "2024-02-01",
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index cd331cbd5fa..e2f07163e9d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -7,9 +7,6 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.vespa.flags.FetchVector;
-import com.yahoo.vespa.flags.Flags;
-import com.yahoo.vespa.flags.IntFlag;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 
 import java.util.Locale;
@@ -23,11 +20,9 @@ import java.util.Locale;
 public class NodeResourceLimits {
 
     private final NodeRepository nodeRepository;
-    private final IntFlag minExclusiveAdvertisedMemoryGbFlag;
 
     public NodeResourceLimits(NodeRepository nodeRepository) {
         this.nodeRepository = nodeRepository;
-        this.minExclusiveAdvertisedMemoryGbFlag = Flags.MIN_EXCLUSIVE_ADVERTISED_MEMORY_GB.bindTo(nodeRepository.flagSource());
     }
 
     /** Validates the resources applications ask for (which are in "advertised" resource space) */
@@ -87,11 +82,7 @@ public class NodeResourceLimits {
     private double minAdvertisedMemoryGb(ApplicationId applicationId, ClusterSpec cluster, boolean exclusive) {
         if (cluster.type() == ClusterSpec.Type.admin) return 1;
         if (!exclusive) return 4;
-        return minExclusiveAdvertisedMemoryGbFlag
-                .with(FetchVector.Dimension.INSTANCE_ID, applicationId.serializedForm())
-                .with(FetchVector.Dimension.CLUSTER_ID, cluster.id().value())
-                .with(FetchVector.Dimension.CLUSTER_TYPE, cluster.type().name())
-                .value();
+        return 8;
     }
 
     private double minAdvertisedDiskGb(NodeResources requested, boolean exclusive) {