diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-06-30 23:58:27 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-06-30 23:58:27 +0200 |
| commit | 64f268aa0be1cffbd3106005a3bf37e3d2d3c762 (patch) | |
| tree | 11a351b9e7af4efc8492b7b792282a3701e43e5c /config-model/src/main/java/com/yahoo | |
| parent | bd12d702c28a85f2f8062a96a376f30d74b39d42 (diff) | |
Revert "Only add search/docproc/feed bundles when required"
This reverts commit 5c38080766861504e26b68ee65e9657f0ae40554.
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 12 |
1 files changed, 0 insertions, 12 deletions
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 5a1103de9a3..2b9961232ea 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,7 +187,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addEmbedderComponents(deployState, cluster, spec); addModelEvaluation(spec, cluster, context); - addVespaBundles(cluster); addModelEvaluationBundles(cluster); addProcessing(deployState, spec, cluster); @@ -584,17 +583,6 @@ 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 |