Add back feature flag wiring that was removed accidentally

1 files changed, 9 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index c202d29cc5d..63fc0b4515f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -10,6 +10,7 @@ import com.yahoo.vespa.model.container.ContainerCluster;
  * Container cluster for cluster-controller containers.
  *
  * @author gjoranv
+ * @author bjorncs
  */
 public class ClusterControllerContainerCluster extends ContainerCluster<ClusterControllerContainer>
 {
@@ -20,7 +21,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
             AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
         super(parent, subId, name, deployState, false);
         addDefaultHandlersWithVip();
-        this.reindexingContext = new ReindexingContext(deployState.reindexing().orElse(Reindexing.DISABLED_INSTANCE));
+        this.reindexingContext = createReindexingContext(deployState);
     }
 
     @Override
@@ -30,4 +31,11 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
 
     public ReindexingContext reindexingContext() { return reindexingContext; }
 
+    private static ReindexingContext createReindexingContext(DeployState deployState) {
+        Reindexing reindexing = deployState.featureFlags().enableAutomaticReindexing()
+                ? deployState.reindexing().orElse(Reindexing.DISABLED_INSTANCE)
+                : Reindexing.DISABLED_INSTANCE;
+        return new ReindexingContext(reindexing);
+    }
+
 }