Remove orchestrate-missing-proxies flag

2 files changed, 1 insertions, 13 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 9e83a43212e..11cfbab66f7 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -130,12 +130,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundBooleanFlag ORCHESTRATE_MISSING_PROXIES = defineFeatureFlag(
-            "orchestrate-missing-proxies", true,
-            List.of("hakonhall"), "2021-08-05", "2021-10-05",
-            "Whether the Orchestrator can assume any missing proxy services are down.",
-            "Takes effect on first (re)start of config server");
-
     public static final UnboundIntFlag NUM_DEPLOY_HELPER_THREADS = defineIntFlag(
             "num-model-builder-threads", 0,
             List.of("balder"), "2021-09-09", "2021-10-01",
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
index 061b3f706a5..7090322f3cf 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
@@ -86,17 +86,11 @@ public class OrchestratorImpl implements Orchestrator {
              zone,
              Clock.systemUTC(),
              new ApplicationApiFactory(configServerConfig.zookeeperserver().size(),
-                                       resolveNumProxies(orchestratorConfig, flagSource),
+                                       orchestratorConfig.numProxies(),
                                        Clock.systemUTC()),
              orchestratorConfig.serviceMonitorConvergenceLatencySeconds());
     }
 
-    private static int resolveNumProxies(OrchestratorConfig orchestratorConfig, FlagSource flagSource) {
-        return Flags.ORCHESTRATE_MISSING_PROXIES.bindTo(flagSource).value() ?
-                orchestratorConfig.numProxies() :
-                0;
-    }
-
     private OrchestratorImpl(ClusterControllerClientFactory clusterControllerClientFactory,
                              StatusService statusService,
                              ServiceMonitor serviceMonitor,