feat: add annotations to configmaps

Signed-off-by: Michael McLeroy <[email protected]>

charts/fluent-bit/Chart.yaml

@@ -5,7 +5,7 @@ keywords:
   - logging
   - fluent-bit
   - fluentd
-version: 0.29.0
+version: 0.29.1
 appVersion: 2.1.3
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
 home: https://fluentbit.io/
@@ -23,4 +23,4 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: "Updated Fluent Bit image to v2.1.3."
+      description: "Added annotation support for configmaps"

charts/fluent-bit/templates/configmap-luascripts.yaml

@@ -5,6 +5,10 @@ metadata:
   name: {{ include "fluent-bit.fullname" . }}-luascripts
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
+  {{- with .Values.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   {{ range $key, $value := .Values.luaScripts }}
   {{ $key }}: {{ $value | quote }}

charts/fluent-bit/templates/configmap.yaml

@@ -5,6 +5,10 @@ metadata:
   name: {{ include "fluent-bit.fullname" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
+  {{- with .Values.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   custom_parsers.conf: |
     {{- (tpl .Values.config.customParsers $) | nindent 4 }}

charts/fluent-bit/values.yaml

@@ -339,6 +339,9 @@ networkPolicy:
 #   ingress:
 #     from: []
 
+configmaps:
+  annotations: {}
+
 luaScripts: {}
 
 ## https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/classic-mode/configuration-file

charts/fluent-operator/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
   - fluent-bit
   - fluentd
   - operator
-version: 2.2.0
+version: 2.2.1
 appVersion: 2.2.0
 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
 home: https://www.fluentd.org/

charts/fluent-operator/templates/fluentbit-containerd-config.yaml

@@ -5,6 +5,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: fluent-bit-containerd-config
+  {{- with .Values.fluentbit.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   containerd.lua: |
     function containerd( tag, timestamp, record)

charts/fluent-operator/templates/fluentbit-lua-config.yaml

@@ -3,6 +3,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: fluent-bit-lua
+  {{- with .Values.fluentbit.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   systemd.lua: |
     function add_time(tag, timestamp, record)

charts/fluent-operator/values.yaml

@@ -102,6 +102,10 @@ fluentbit:
   #     name: hostProc
   #     readOnly: true
 
+  configmaps:
+    # Additional annotations to add to configmaps
+    annotations: {}
+
   # Set a limit of memory that Tail plugin can use when appending data to the Engine.
   # You can find more details here: https://docs.fluentbit.io/manual/pipeline/inputs/tail#config
   # If the limit is reach, it will be paused; when the data is flushed it resumes.

charts/fluentd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: fluentd
 description: A Helm chart for Kubernetes
 # type: application
-version: 0.4.1
+version: 0.4.2
 appVersion: v1.14.6
 icon: https://www.fluentd.org/images/miscellany/fluentd-logo_2x.png
 home: https://www.fluentd.org/

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 }}

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.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   prometheus.conf: |-
     <source>

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.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   systemd.conf: |-
     <source>

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.configmaps.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.configmaps.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 -}}
+  {{- end }}
 data:
   fluent.conf: |-
     # do not collect fluentd logs to avoid infinite loops.

charts/fluentd/values.yaml

@@ -271,12 +271,17 @@ dashboards:
   namespace: ""
   labels:
     grafana_dashboard: '"1"'
+  annotations: {}
 
 ## Fluentd list of plugins to install
 ##
 plugins: []
 # - fluent-plugin-out-http
 
+configmaps:
+  # Additional annotations to add to configmaps
+  annotations: {}
+
 ## Add fluentd config files from K8s configMaps
 ##
 configMapConfigs: []