feat(fluentd): add annotations for configs and dashbaords

Signed-off-by: Michael McLeroy <[email protected]>
fluent · May 23, 2023 · 2de9165 · 2de9165
1 parent 7f319a4
commit 2de9165
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/charts/fluentd/templates/configmap-dashboards.yaml b/charts/fluentd/templates/configmap-dashboards.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- range $key, $val := $.Values.dashboards.labels }}
     {{ $key }}: {{ $val }}
     {{- end }}
+  {{- with $.Values.dashboards.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   {{ base $path }}: |-
     {{- $.Files.Get $path | nindent 4 }}

diff --git a/charts/fluentd/templates/files.conf/prometheus.yaml b/charts/fluentd/templates/files.conf/prometheus.yaml
@@ -4,6 +4,10 @@ metadata:
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
   name: fluentd-prometheus-conf-{{ include "fluentd.shortReleaseName" . }}
+  {{- with .Values.configs.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   prometheus.conf: |-
     <source>

diff --git a/charts/fluentd/templates/files.conf/systemd.yaml b/charts/fluentd/templates/files.conf/systemd.yaml
@@ -4,6 +4,10 @@ metadata:
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
   name: fluentd-systemd-conf-{{ include "fluentd.shortReleaseName" . }}
+  {{- with .Values.configs.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   systemd.conf: |-
     <source>

diff --git a/charts/fluentd/templates/fluentd-configurations-cm.yaml b/charts/fluentd/templates/fluentd-configurations-cm.yaml
@@ -6,6 +6,10 @@ metadata:
   name: fluentd-config-{{ include "fluentd.shortReleaseName" . }}
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
+  {{- with .Values.configs.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
 {{- range $key, $value := .Values.fileConfigs }}
   {{$key }}: |-
@@ -21,6 +25,10 @@ metadata:
   name: fluentd-main-{{ include "fluentd.shortReleaseName" . }}
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
+  {{- with .Values.configs.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   fluent.conf: |-
     # do not collect fluentd logs to avoid infinite loops.

diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
@@ -272,12 +272,18 @@ dashboards:
   namespace: ""
   labels:
     grafana_dashboard: '"1"'
+  annotations: {}
 
 ## Fluentd list of plugins to install
 ##
 plugins: []
 # - fluent-plugin-out-http
 
+## Settings for configMapConfigs and fileConfigs
+##
+configs:
+  annotations: {}
+
 ## Add fluentd config files from K8s configMaps
 ##
 configMapConfigs: []