diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-30 13:38:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 13:38:31 +0200 |
| commit | ffb3159411f5d967011385d59826d76c6068875f (patch) | |
| tree | c922fb70c6d46eb1627d333112e1f8f51ba4917e /config-model/src/main/java/com | |
| parent | aab2c5a5368fe3b3b95be2a1764849c94b334aa4 (diff) | |
| parent | 5c38080766861504e26b68ee65e9657f0ae40554 (diff) | |
Merge pull request #23279 from vespa-engine/bjorncs/slim-default-platform-bundle-set
Only add search/docproc/feed bundles when required [run-systemtest]
Diffstat (limited to 'config-model/src/main/java/com')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 12 |
1 files changed, 12 insertions, 0 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 f971aa97e6a..1aab98a115f 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 |