Implement mechanism for avoiding unnecesssary bundles.

+ Avoid installing security bundles for clustercontroller and
  metrics-proxy.

4 files changed, 50 insertions, 14 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 a7f3a6224f2..f7007fec181 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
@@ -7,8 +7,12 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.container.ContainerCluster;
+import com.yahoo.vespa.model.container.PlatformBundles;
 
+import java.nio.file.Path;
+import java.util.Collections;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Container cluster for cluster-controller containers.
@@ -18,6 +22,8 @@ import java.util.Optional;
  */
 public class ClusterControllerContainerCluster extends ContainerCluster<ClusterControllerContainer> {
 
+    private static final Set<Path> UNNECESSARY_BUNDLES = Collections.unmodifiableSet(PlatformBundles.VESPA_SECURITY_BUNDLES);
+
     private final ReindexingContext reindexingContext;
 
     public ClusterControllerContainerCluster(
@@ -29,6 +35,9 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
     }
 
     @Override
+    protected Set<Path> unnecessaryPlatformBundles() { return UNNECESSARY_BUNDLES; }
+
+    @Override
     protected void doPrepare(DeployState deployState) { }
 
     @Override protected boolean messageBusEnabled() { return false; }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index 680a4b97f86..928630214f4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -45,6 +45,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import static com.yahoo.vespa.model.admin.metricsproxy.ConsumersConfigGenerator.addMetrics;
@@ -74,6 +75,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
     private static final String METRICS_PROXY_NAME = "metrics-proxy";
     static final Path METRICS_PROXY_BUNDLE_FILE = PlatformBundles.absoluteBundlePath(METRICS_PROXY_NAME);
     static final String METRICS_PROXY_BUNDLE_NAME = "com.yahoo.vespa." + METRICS_PROXY_NAME;
+    private static final Set<Path> UNNECESSARY_BUNDLES = Collections.unmodifiableSet(PlatformBundles.VESPA_SECURITY_BUNDLES);
 
     static final class AppDimensionNames {
         static final String SYSTEM = "system";
@@ -98,6 +100,9 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
         addClusterComponents();
     }
 
+    @Override
+    protected Set<Path> unnecessaryPlatformBundles() { return UNNECESSARY_BUNDLES; }
+
     private void addClusterComponents() {
         addMetricsProxyComponent(ApplicationDimensions.class);
         addMetricsProxyComponent(ConfigSentinelClient.class);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index baeac48e4e8..32bdf6e182e 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -194,6 +194,8 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         addSimpleComponent(com.yahoo.jdisc.http.server.jetty.Janitor.class);
     }
 
+    protected abstract boolean messageBusEnabled();
+
     public ClusterSpec.Id id() { return ClusterSpec.Id.from(getName()); }
 
     public void setZone(Zone zone) {
@@ -455,18 +457,20 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     }
 
     /**
-     * Adds the Vespa bundles that are necessary for all container types.
+     * Adds the Vespa bundles that are necessary for most container types.
+     * Note that some of these can be removed later by the individual cluster types.
      */
     public void addCommonVespaBundles() {
         PlatformBundles.COMMON_VESPA_BUNDLES.forEach(this::addPlatformBundle);
+        PlatformBundles.VESPA_SECURITY_BUNDLES.forEach(this::addPlatformBundle);
     }
 
-    /*
-    Add all search/docproc/feed related platform bundles.
-    This is only required for application configured containers as the platform bundle set is not allowed to change
-    between config generations. For standalone container platform bundles can be added on features enabled as an
-    update of application package requires restart.
-    */
+    /**
+     * Add all search/docproc/feed related platform bundles.
+     * These are only required for application configured containers as the platform bundle set is not allowed to change
+     * between config generations. For standalone container platform bundles can be added on features enabled as an
+     * update of application package requires restart.
+     */
     public void addAllPlatformBundles() {
         ContainerDocumentApi.addVespaClientContainerBundle(this);
         addSearchAndDocprocBundles();
@@ -481,9 +485,19 @@ public abstract class ContainerCluster<CONTAINER extends Container>
      * @param bundlePath usually an absolute path, e.g. '$VESPA_HOME/lib/jars/foo.jar'
      */
     public final void addPlatformBundle(Path bundlePath) {
-        platformBundles.add(bundlePath);
+        if (! unnecessaryPlatformBundles().contains(bundlePath)) {
+            platformBundles.add(bundlePath);
+        } else {
+            log.fine(() -> "Not installing bundle " + bundlePath + " for cluster " + getName());
+        }
     }
 
+    /**
+     * Implement in subclasses to avoid installing unnecessary bundles, see {@link PlatformBundles}
+     * Should only return constant values, as there is no guarantee for when this is called.
+     */
+    protected Set<Path> unnecessaryPlatformBundles() { return Set.of(); }
+
     @Override
     public void getConfig(PlatformBundlesConfig.Builder builder) {
         platformBundles.stream()
@@ -645,8 +659,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         return "container cluster '" + getName() + "'";
     }
 
-    protected abstract boolean messageBusEnabled();
-
     /**
      * Mark whether the config emitted by this cluster currently should be applied by clients already running with
      * a previous generation of it only by restarting the consuming processes.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
index d7a4af7145b..a93fe6967b4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
@@ -33,18 +33,28 @@ public class PlatformBundles {
     public static final String SEARCH_AND_DOCPROC_BUNDLE = BundleInstantiationSpecification.CONTAINER_SEARCH_AND_DOCPROC;
 
     // Bundles that must be loaded for all container types.
-    public static final Set<Path> COMMON_VESPA_BUNDLES = Stream.of(
+    public static final Set<Path> COMMON_VESPA_BUNDLES = toBundlePaths(
             "container-spifly.jar",  // Aries SPIFly repackaged
             "zkfacade",
             "zookeeper-server"  // TODO: not necessary in metrics-proxy.
-    ).map(PlatformBundles::absoluteBundlePath).collect(Collectors.toSet());
+    );
+
+    public static final Set<Path> VESPA_SECURITY_BUNDLES = toBundlePaths(
+            "jdisc-security-filters",
+            "vespa-athenz");
 
-    public static final Set<Path> SEARCH_AND_DOCPROC_BUNDLES = Stream.of(
+    public static final Set<Path> SEARCH_AND_DOCPROC_BUNDLES = toBundlePaths(
             SEARCH_AND_DOCPROC_BUNDLE,
             "container-search-gui",
             "docprocs",
             "linguistics-components"
-    ).map(PlatformBundles::absoluteBundlePath).collect(Collectors.toSet());
+    );
+
+    private static Set<Path> toBundlePaths(String... bundleNames) {
+        return Stream.of(bundleNames)
+                .map(PlatformBundles::absoluteBundlePath)
+                .collect(Collectors.toSet());
+    }
 
     public static Path absoluteBundlePath(String fileName) {
         return absoluteBundlePath(fileName, JarSuffix.JAR_WITH_DEPS);