feat(fluent-bit-aggregator): Fixed config mount

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
stevehipwell · Jun 16, 2023 · 9a6ff3d · 9a6ff3d
1 parent f4a5a56
commit 9a6ff3d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/charts/fluent-bit-aggregator/CHANGELOG.md b/charts/fluent-bit-aggregator/CHANGELOG.md
@@ -18,6 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security - In case of vulnerabilities.
 -->
 
+## [v0.3.3] - 2023-06-16
+
+### Fixed
+
+- Fixed config mount to support hot-reload.
+
 ## [v0.3.2] - 2023-06-15
 
 ### Fixed

diff --git a/charts/fluent-bit-aggregator/Chart.yaml b/charts/fluent-bit-aggregator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: fluent-bit-aggregator
 description: Helm chart for Fluent Bit running as an aggregation stateful set.
 type: application
-version: 0.3.2
+version: 0.3.3
 appVersion: 2.1.4
 keywords:
   - fluent
@@ -23,4 +23,4 @@ annotations:
   artifacthub.io/alternativeName: fluent-bit
   artifacthub.io/changes: |
     - kind: fixed
-      description: "Fixed hot-reload volume mounts."
+      description: "Fixed config mount to support hot-reload."
diff --git a/charts/fluent-bit-aggregator/README.md b/charts/fluent-bit-aggregator/README.md
@@ -1,6 +1,6 @@
 # fluent-bit-aggregator
 
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.4](https://img.shields.io/badge/AppVersion-2.1.4-informational?style=flat-square)
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.4](https://img.shields.io/badge/AppVersion-2.1.4-informational?style=flat-square)
 
 Helm chart for Fluent Bit running as an aggregation stateful set.
 
@@ -22,14 +22,14 @@ Helm chart for Fluent Bit running as an aggregation stateful set.
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install fluent-bit-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator --version 0.3.2
+helm upgrade --install fluent-bit-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator --version 0.3.3
 ```
 
 Alternativly you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator --version 0.3.2
+helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator --version 0.3.3
 ```
 
 ## Values

diff --git a/charts/fluent-bit-aggregator/templates/NOTES.txt b/charts/fluent-bit-aggregator/templates/NOTES.txt
@@ -1,5 +1,5 @@
 ***********************************************************************
-* Fluent Bit Aggregator                                                  *
+* Fluent Bit Aggregator                                               *
 ***********************************************************************
   Chart version: {{ .Chart.Version }}
   App version:   {{ .Chart.AppVersion }}

diff --git a/charts/fluent-bit-aggregator/templates/statefulset.yaml b/charts/fluent-bit-aggregator/templates/statefulset.yaml
@@ -71,8 +71,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           args:
-            - /fluent-bit/bin/fluent-bit
-            - --config=/fluent-bit/etc/fluent-bit.conf
+            - --config=/fluent-bit/etc/conf/fluent-bit.conf
           {{- if .Values.hotReload.enabled }}
             - --enable-hot-reload
           {{- end }}
@@ -94,18 +93,7 @@ spec:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
           volumeMounts:
             - name: config
-              mountPath: /fluent-bit/etc/fluent-bit.conf
-              subPath: fluent-bit.conf
-          {{- if .Values.config.customParsers }}
-            - name: config
-              mountPath: /fluent-bit/etc/custom-parsers.conf
-              subPath: custom-parsers.conf
-          {{- end }}
-          {{- range $k, $v := .Values.config.extraFiles }}
-            - name: config
-              mountPath: {{ printf "/fluent-bit/etc/%s" $k }}
-              subPath: {{ $k }}
-          {{- end }}
+              mountPath: /fluent-bit/etc/conf
           {{- if .Values.config.luaScripts }}
             - name: scripts
               mountPath: /fluent-bit/scripts
@@ -126,10 +114,10 @@ spec:
           image: {{ include "fluent-bit-aggregator.reloaderImage" . }}
           args:
             - {{ printf "-webhook-url=http://localhost:%s/api/v2/reload" (toString .Values.service.httpPort) }}
-            - -volume-dir=/watch
+            - -volume-dir=/watch/config
           volumeMounts:
             - name: config
-              mountPath: /watch
+              mountPath: /watch/config
           {{- with .Values.hotReload.resources }}
           resources:
             {{- toYaml . | nindent 12 }}