From 5ccabc6b96cf4f11561a58b04f5c804bc2f59591 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Fri, 7 Mar 2025 12:31:41 +0100
Subject: [PATCH] Correct fluentbit's extraVolumeMounts' indentation
---
templates/fluentbit-logs/daemonset.yaml | 2 +-
templates/fluentbit-metrics/statefulset.yaml | 2 +-
tests/fluentbit-logs/daemonset.yaml | 13 +++++++++++++
tests/fluentbit-metrics/statefulset.yaml | 13 +++++++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/templates/fluentbit-logs/daemonset.yaml b/templates/fluentbit-logs/daemonset.yaml
index caac986..e384fc6 100644
--- a/templates/fluentbit-logs/daemonset.yaml
+++ b/templates/fluentbit-logs/daemonset.yaml
@@ -44,7 +44,7 @@ spec:
mountPath: /etc/machine-id
readOnly: true
{{- if .Values.logs.fluentbit.extraVolumeMounts }}
- {{- toYaml .Values.logs.fluentbit.extraVolumeMounts | nindent 6 }}
+ {{- toYaml .Values.logs.fluentbit.extraVolumeMounts | nindent 12 }}
{{- end }}
volumes:
- name: config
diff --git a/templates/fluentbit-metrics/statefulset.yaml b/templates/fluentbit-metrics/statefulset.yaml
index 4fe610a..0cb8f8c 100644
--- a/templates/fluentbit-metrics/statefulset.yaml
+++ b/templates/fluentbit-metrics/statefulset.yaml
@@ -40,7 +40,7 @@ spec:
- name: fluentbit
mountPath: /flb-storage/
{{- if .Values.metrics.fluentbit.extraVolumeMounts }}
- {{- toYaml .Values.metrics.fluentbit.extraVolumeMounts | nindent 6 }}
+ {{- toYaml .Values.metrics.fluentbit.extraVolumeMounts | nindent 12 }}
{{- end }}
{{- if or (.Values.metrics.defaultNodeSelector) (.Values.metrics.fluentbit.nodeSelector) }}
nodeSelector:
diff --git a/tests/fluentbit-logs/daemonset.yaml b/tests/fluentbit-logs/daemonset.yaml
index 4669c91..d16a653 100644
--- a/tests/fluentbit-logs/daemonset.yaml
+++ b/tests/fluentbit-logs/daemonset.yaml
@@ -36,3 +36,16 @@ tests:
apiVersion: "apps/v1"
name: it-monit-logs-collector-fluentbit
not: true
+ - it: should deploy extra volume mounts if configured
+ set:
+ logs.enabled: true
+ logs.fluentbit.enabled: true
+ logs.fluentbit.extraVolumeMounts:
+ - name: test
+ mountPath: /test
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].volumeMounts
+ content:
+ name: test
+ mountPath: /test
diff --git a/tests/fluentbit-metrics/statefulset.yaml b/tests/fluentbit-metrics/statefulset.yaml
index 56f19e0..597d557 100644
--- a/tests/fluentbit-metrics/statefulset.yaml
+++ b/tests/fluentbit-metrics/statefulset.yaml
@@ -27,3 +27,16 @@ tests:
apiVersion: "apps/v1"
name: it-monit-metrics-collector-fluentbit
not: true
+ - it: should deploy extra volume mounts if configured
+ set:
+ metrics.enabled: true
+ metrics.fluentbit.enabled: true
+ metrics.fluentbit.extraVolumeMounts:
+ - name: test
+ mountPath: /test
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].volumeMounts
+ content:
+ name: test
+ mountPath: /test
--
GitLab