Revert "Merge pull request #23299 from vespa-engine/bjorncs/bundles"

This reverts commit af26e19c98e74b3417b5c94fe4b394914ba93ac3, reversing
changes made to a5fda4e93388be73987f662998518b26b13780c2.

2 files changed, 13 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index cb4fe8f67ca..2b6efab3389 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -36,6 +36,7 @@ import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.configserver.ConfigserverCluster;
+import com.yahoo.vespa.model.container.docproc.DocprocChains;
 import com.yahoo.vespa.model.utils.FileSender;
 
 import java.util.ArrayList;
@@ -114,14 +115,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
 
         addMetricsHandlers();
         addTestrunnerComponentsIfTester(deployState);
-        addPlatformBundlesForApplicationCluster();
-    }
-
-    private void addPlatformBundlesForApplicationCluster() {
-        Set<String> bundles = Set.of(
-                "container-search-and-docproc", "container-search-gui", "docprocs",
-                "linguistics-components", "vespaclient-container-plugin");
-        bundles.forEach(b -> addPlatformBundle(PlatformBundles.absoluteBundlePath(b)));
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 2b9961232ea..5a1103de9a3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -187,6 +187,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         addEmbedderComponents(deployState, cluster, spec);
         addModelEvaluation(spec, cluster, context);
+        addVespaBundles(cluster);
         addModelEvaluationBundles(cluster);
 
         addProcessing(deployState, spec, cluster);
@@ -583,6 +584,17 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         return (child != null) ? Integer.parseInt(child.getTextContent()) : defaultValue;
     }
 
+    private void addVespaBundles(ApplicationContainerCluster cluster) {
+        // Skip model-evaluation bundles for node-admin
+        if (cluster.id().value().equals("node-admin")) return;
+
+        Set<String> bundles = Set.of(
+                "container-search-and-docproc", "container-search-gui", "docprocs",
+                "linguistics-components", "vespaclient-container-plugin");
+        bundles.forEach(b -> cluster.addPlatformBundle(PlatformBundles.absoluteBundlePath(b)));
+        addModelEvaluationBundles(cluster);
+    }
+
     protected void addModelEvaluationBundles(ApplicationContainerCluster cluster) {
         /* These bundles are added to all application container clusters, even if they haven't
          * declared 'model-evaluation' in services.xml, because there are many public API packages