From ca5d248dfe2f07c1d489f0e780d738a1d90e5e6d Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Tue, 30 Jul 2024 07:36:27 +1000
Subject: [PATCH] fix volumes mounts

---
 infrastructures/logstash/base/values.yaml            | 12 ++++++------
 .../logstash/env/k3s-cluster/kustomization.yaml      |  3 +--
 .../logstash/env/k3s-cluster/pipelines.yaml          | 11 -----------
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 infrastructures/logstash/env/k3s-cluster/pipelines.yaml

diff --git a/infrastructures/logstash/base/values.yaml b/infrastructures/logstash/base/values.yaml
index 894ff60..d858562 100644
--- a/infrastructures/logstash/base/values.yaml
+++ b/infrastructures/logstash/base/values.yaml
@@ -2,16 +2,16 @@ namespaceOverride: logstash
 clusterDomain: logstash.logstash.svc.cluster.local
 input: ""
 output: ""
-existingConfiguration: "logstash-pipelines"
+existingConfiguration: ""
 enableMultiplePipelines: true
 extraVolumes:
-  - name: logstash-config-http
+  - name: configurations
     hostPath:
-      path: /mnt/nfs/AppData/logstash/config/http.conf
-      type: File
+      path: /mnt/nfs/AppData/logstash/config
+      type: Directory
 extraVolumeMounts:
-  - name: logstash-config-http
-    mountPath: /bitnami/logstash/config/http.conf
+  - name: configurations
+    mountPath: /bitnami/logstash/config
 containerPorts:
   - name: http
     containerPort: 8080
diff --git a/infrastructures/logstash/env/k3s-cluster/kustomization.yaml b/infrastructures/logstash/env/k3s-cluster/kustomization.yaml
index 2935620..a227ac4 100644
--- a/infrastructures/logstash/env/k3s-cluster/kustomization.yaml
+++ b/infrastructures/logstash/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-  - ./pipelines.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file
diff --git a/infrastructures/logstash/env/k3s-cluster/pipelines.yaml b/infrastructures/logstash/env/k3s-cluster/pipelines.yaml
deleted file mode 100644
index 559f730..0000000
--- a/infrastructures/logstash/env/k3s-cluster/pipelines.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: logstash-pipelines
-  namespace: logstash
-data:
-  pipelines.yaml: |
-    - pipeline.id: http
-      path.config: "/opt/bitnami/logstash/config/http.conf"
-    - pipeline.id: syslog
-      path.config: "/opt/bitnami/logstash/config/syslog.conf"