refactors opensearch dashboard to accept extra packages (#2337)

Signed-off-by: Mritunjay <[email protected]>
chainguard-images · Mar 11, 2024 · b494fee · b494fee
1 parent a20b086
commit b494fee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/images/opensearch-dashboards/config/main.tf b/images/opensearch-dashboards/config/main.tf
@@ -6,7 +6,23 @@ terraform {
 
 variable "extra_packages" {
   description = "The additional packages to install (e.g. opensearch-dashboards-2)."
-  default     = []
+  default = [
+    "opensearch-dashboards-2",
+    "opensearch-dashboards-2-config",
+    "opensearch-dashboards-2-dashboards-observability",
+    "opensearch-dashboards-2-dashboards-reporting",
+    "opensearch-dashboards-2-dashboards-visualizations",
+    "opensearch-dashboards-2-dashboards-query-workbench",
+    "opensearch-dashboards-2-dashboards-maps",
+    "opensearch-dashboards-2-anomaly-detection-dashboards-plugin",
+    "opensearch-dashboards-2-ml-commons-dashboards",
+    "opensearch-dashboards-2-index-management-dashboards-plugin",
+    "opensearch-dashboards-2-dashboards-notifications",
+    "opensearch-dashboards-2-alerting-dashboards-plugin",
+    "opensearch-dashboards-2-security-analytics-dashboards-plugin",
+    "opensearch-dashboards-2-security-dashboards-plugin",
+    "opensearch-dashboards-2-dashboards-search-relevance",
+  ]
 }
 
 data "apko_config" "this" {

diff --git a/images/opensearch-dashboards/config/template.apko.yaml b/images/opensearch-dashboards/config/template.apko.yaml
@@ -3,21 +3,6 @@ contents:
     - bash
     - busybox
     - dumb-init
-    - opensearch-dashboards-2-config
-    - opensearch-dashboards-2
-    - opensearch-dashboards-2-dashboards-observability
-    - opensearch-dashboards-2-dashboards-reporting
-    - opensearch-dashboards-2-dashboards-visualizations
-    - opensearch-dashboards-2-dashboards-query-workbench
-    - opensearch-dashboards-2-dashboards-maps
-    - opensearch-dashboards-2-anomaly-detection-dashboards-plugin
-    - opensearch-dashboards-2-ml-commons-dashboards
-    - opensearch-dashboards-2-index-management-dashboards-plugin
-    - opensearch-dashboards-2-dashboards-notifications
-    - opensearch-dashboards-2-alerting-dashboards-plugin
-    - opensearch-dashboards-2-security-analytics-dashboards-plugin
-    - opensearch-dashboards-2-security-dashboards-plugin
-    - opensearch-dashboards-2-dashboards-search-relevance
     - nss # required by reporting
     - fontconfig # required by reporting
     - freetype # required by reporting