Remove healthmonitor-monitorinfra, dupermodel-contains-infra, dupermodel-use-configserverconfig, proxyhost-uses-real-orchestrator, and confighost-uses-real-orchestrator flags

1 files changed, 0 insertions, 33 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 cc4d55c0c94..64112a29a59 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -17,27 +17,6 @@ import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME;
 public class Flags {
     private static volatile TreeMap<FlagId, FlagDefinition> flags = new TreeMap<>();
 
-    public static final UnboundBooleanFlag HEALTHMONITOR_MONITOR_INFRA = defineFeatureFlag(
-            "healthmonitor-monitorinfra", true,
-                    "Whether the health monitor in service monitor monitors the health of infrastructure applications.",
-                    "Affects all applications activated after the value is changed.",
-            HOSTNAME);
-
-    public static final UnboundBooleanFlag DUPERMODEL_CONTAINS_INFRA = defineFeatureFlag(
-            "dupermodel-contains-infra", true,
-            "Whether the DuperModel in config server/controller includes active infrastructure applications " +
-                    "(except from controller/config apps).",
-            "Requires restart of config server/controller to take effect.",
-            HOSTNAME);
-
-    public static final UnboundBooleanFlag DUPERMODEL_USE_CONFIGSERVERCONFIG = defineFeatureFlag(
-            "dupermodel-use-configserverconfig", false,
-            "For historical reasons, the ApplicationInfo in the DuperModel for controllers and config servers " +
-                    "is based on the ConfigserverConfig (this flag is true). We want to transition to use the " +
-                    "infrastructure application activated by the InfrastructureProvisioner once that supports health.",
-            "Requires restart of config server/controller to take effect.",
-            HOSTNAME);
-
     public static final UnboundBooleanFlag USE_CONFIG_SERVER_CACHE = defineFeatureFlag(
             "use-config-server-cache", true,
             "Whether config server will use cache to answer config requests.",
@@ -50,18 +29,6 @@ public class Flags {
             "Takes effect only at bootstrap of config server/controller",
             HOSTNAME);
 
-    public static final UnboundBooleanFlag PROXYHOST_USES_REAL_ORCHESTRATOR = defineFeatureFlag(
-            "proxyhost-uses-real-orchestrator", true,
-            "Whether proxy hosts uses the real Orchestrator when suspending/resuming, or a synthetic.",
-            "Takes effect immediately when changed.",
-            HOSTNAME);
-
-    public static final UnboundBooleanFlag CONFIGHOST_USES_REAL_ORCHESTRATOR = defineFeatureFlag(
-            "confighost-uses-real-orchestrator", true,
-            "Whether the config server hosts uses the real Orchestrator when suspending/resuming, or a synthetic.",
-            "Takes effect immediately when changed.",
-            HOSTNAME);
-
     public static final UnboundBooleanFlag ENABLE_CROWDSTRIKE = defineFeatureFlag(
             "enable-crowdstrike", true,
             "Whether to enable CrowdStrike.", "Takes effect on next host admin tick",