[fluentd] allow multiple deployments

charts/fluentd/Chart.yaml

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

charts/fluentd/README.md

@@ -16,6 +16,17 @@ To install a release named `fluentd`, run:
 ```sh
 helm install fluentd fluent/fluentd
 ```
+## Upgrading
+
+### To 0.4.0
+
+Although the services will deploy and generally work, version 0.4.0 introduces some changes that are considered _breaking changes_. To upgrade, you should do the following to avoid any potential conflicts or problems:
+
+- Add the `mountVarLogDirectory` and `mountDockerContainersDirectory` values and set them to the values you need; to follow the previous setup where these were mounted by default, set the values to `true`, e.g. `mountVarLogDirectory: true`
+- If you have the `varlog` mount point defined and enabled under both `volumes` and `volumeMounts`, set `mountVarLogDirectory` to true
+- If you have the `varlibdockercontainers` mount point defined and enabled under both `volumes` and `volumeMounts`, set `mountDockerContainersDirectory` to true
+- Remove the previous default volume and volume mount definitions - `etcfluentd-main`, `etcfluentd-config`, `varlog`, and `varlibdockercontainers`
+- Remove the `FLUENTD_CONF` entry from the `env:` list
 
 ## Chart Values
 

charts/fluentd/templates/_helpers.tpl

@@ -61,3 +61,32 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Shortened version of the releaseName, applied as a suffix to numerous resources.
+*/}}
+{{- define "fluentd.shortReleaseName" -}}
+{{- .Release.Name | trunc 35 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Name of the configMap used for the fluentd.conf configuration file; allows users to override the default.
+*/}}
+{{- define "fluentd.mainConfigMapName" -}}
+{{- if .Values.mainConfigMapNameOverride -}}
+    {{ .Values.mainConfigMapNameOverride }}
+{{- else -}}
+    {{ printf "%s-%s" "fluentd-main" ( include "fluentd.shortReleaseName" . ) }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Name of the configMap used for additional configuration files; allows users to override the default.
+*/}}
+{{- define "fluentd.extraFilesConfigMapName" -}}
+{{- if .Values.extraFilesConfigMapNameOverride -}}
+    {{ printf "%s" .Values.extraFilesConfigMapNameOverride }}
+{{- else -}}
+    {{ printf "%s-%s" "fluentd-config" ( include "fluentd.shortReleaseName" . ) }}
+{{- end -}}
+{{- end -}}

charts/fluentd/templates/_pod.tpl

@@ -33,13 +33,15 @@ containers:
       {{- end }}
       exec /fluentd/entrypoint.sh
   {{- end }}
-  {{- if .Values.env }}
     env:
-    {{- toYaml .Values.env | nindent 6 }}
-  {{- end }}
+    - name: FLUENTD_CONF
+      value: "../../../etc/fluent/fluent.conf"
+    {{- if .Values.env }}
+    {{- toYaml .Values.env | nindent 4 }}
+    {{- end }}
   {{- if .Values.envFrom }}
     envFrom:
-    {{- toYaml .Values.envFrom | nindent 6 }}
+    {{- toYaml .Values.envFrom | nindent 4 }}
   {{- end }}
     ports:
     - name: metrics
@@ -61,23 +63,58 @@ containers:
     resources:
       {{- toYaml .Values.resources | nindent 8 }}
     volumeMounts:
-      {{- toYaml .Values.volumeMounts | nindent 6 }}
-      {{- range $key := .Values.configMapConfigs }}
-      {{- print "- name: fluentd-custom-cm-" $key  | nindent 6 }}
-        {{- print "mountPath: /etc/fluent/" $key ".d"  | nindent 8 }}
-      {{- end }}
-      {{- if .Values.persistence.enabled }}
-      - mountPath: /var/log/fluent
-        name: {{ include "fluentd.fullname" . }}-buffer
-      {{- end }}
+    - name: etcfluentd-main
+      mountPath: /etc/fluent
+    - name: etcfluentd-config
+      mountPath: /etc/fluent/config.d/
+    {{- if .Values.mountVarLogDirectory }}
+    - name: varlog
+      mountPath: /var/log
+    {{- end }}
+    {{- if .Values.mountDockerContainersDirectory }}
+    - name: varlibdockercontainers
+      mountPath: /var/lib/docker/containers
+      readOnly: true
+    {{- end }}
+    {{- if .Values.volumeMounts -}}
+    {{- toYaml .Values.volumeMounts | nindent 4 }}
+    {{- end -}}
+    {{- range $key := .Values.configMapConfigs }}
+    {{- print "- name: " $key | nindent 4 }}
+      {{- print "mountPath: /etc/fluent/" $key ".d"  | nindent 6 }}
+    {{- end }}
+    {{- if .Values.persistence.enabled }}
+    - mountPath: /var/log/fluent
+      name: {{ include "fluentd.fullname" . }}-buffer
+    {{- end }}
 volumes:
-  {{- toYaml .Values.volumes | nindent 2 }}
-  {{- range $key := .Values.configMapConfigs }}
-  {{- print "- name: fluentd-custom-cm-" $key  | nindent 2 }}
-    configMap:
-      {{- print "name: " .  | nindent 6 }}
-      defaultMode: 0777
-  {{- end }}
+- name: etcfluentd-main
+  configMap:
+    name: {{ include "fluentd.mainConfigMapName" . }}
+    defaultMode: 0777
+- name: etcfluentd-config
+  configMap:
+    name: {{ include "fluentd.extraFilesConfigMapName" . }}
+    defaultMode: 0777
+{{- if .Values.mountVarLogDirectory }}
+- name: varlog
+  hostPath:
+    path: /var/log
+{{- end }}
+{{- if .Values.mountDockerContainersDirectory }}
+- name: varlibdockercontainers
+  hostPath:
+    path: /var/lib/docker/containers
+{{- end }}
+{{- if .Values.volumes -}}
+{{- toYaml .Values.volumes | nindent 0 }}
+{{- end -}}
+{{- range $key := .Values.configMapConfigs }}
+{{- print "- name: " $key | nindent 0 }}
+  configMap:
+    {{- print "name: " $key "-" ( include "fluentd.shortReleaseName" $ ) | nindent 4 }}
+    defaultMode: 0777
+{{- end }}
 {{- with .Values.nodeSelector }}
 nodeSelector:
   {{- toYaml . | nindent 2 }}

charts/fluentd/templates/configmap-dashboards.yaml

@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dashboard-{{ trimSuffix ".json" (base $path) }}
+  name: dashboard-{{ trimSuffix ".json" (base $path) }}-{{ include "fluentd.shortReleaseName" $ }}
   namespace: {{ $.Values.dashboards.namespace | default $.Release.Namespace }}
   labels:
     {{- include "fluentd.labels" $ | nindent 4 }}

charts/fluentd/templates/files.conf/prometheus.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
-  name: fluentd-prometheus-conf
+  name: fluentd-prometheus-conf-{{ include "fluentd.shortReleaseName" . }}
 data:
   prometheus.conf: |-
     <source>

charts/fluentd/templates/files.conf/systemd.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
-  name: fluentd-systemd-conf
+  name: fluentd-systemd-conf-{{ include "fluentd.shortReleaseName" . }}
 data:
   systemd.conf: |-
     <source>

charts/fluentd/templates/fluentd-configurations-cm.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: fluentd-config
+  name: fluentd-config-{{ include "fluentd.shortReleaseName" . }}
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
 data:
@@ -10,12 +10,13 @@ data:
     {{- $value | nindent 4 }}
 {{- end }}
 
+{{- if not .Values.mainConfigMapNameOverride }}
 ---
 
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: fluentd-main
+  name: fluentd-main-{{ include "fluentd.shortReleaseName" . }}
   labels:
     {{- include "fluentd.labels" . | nindent 4 }}
 data:
@@ -32,3 +33,4 @@ data:
     {{- range $key := .Values.configMapConfigs }}
     {{- print "@include " $key ".d/*"  | nindent 4 }}
     {{- end }}
+{{- end }}

charts/fluentd/values.yaml

@@ -160,9 +160,9 @@ updateStrategy: {}
 #     maxUnavailable: 1
 
 ## Additional environment variables to set for fluentd pods
-env:
-- name: "FLUENTD_CONF"
-  value: "../../../etc/fluent/fluent.conf"
+env: []
+  # - name: "FLUENTD_CONF"
+  #   value: "../../../etc/fluent/fluent.conf"
   # - name: FLUENT_ELASTICSEARCH_HOST
   #   value: "elasticsearch-master"
   # - name: FLUENT_ELASTICSEARCH_PORT
@@ -172,32 +172,19 @@ envFrom: []
 
 initContainers: []
 
-volumes:
-- name: varlog
-  hostPath:
-    path: /var/log
-- name: varlibdockercontainers
-  hostPath:
-    path: /var/lib/docker/containers
-- name: etcfluentd-main
-  configMap:
-    name: fluentd-main
-    defaultMode: 0777
-- name: etcfluentd-config
-  configMap:
-    name: fluentd-config
-    defaultMode: 0777
-
-volumeMounts:
-- name: varlog
-  mountPath: /var/log
-- name: varlibdockercontainers
-  mountPath: /var/lib/docker/containers
-  readOnly: true
-- name: etcfluentd-main
-  mountPath: /etc/fluent
-- name: etcfluentd-config
-  mountPath: /etc/fluent/config.d/
+## Name of the configMap containing a custom fluentd.conf configuration file to use instead of the default.
+# mainConfigMapNameOverride: ""
+
+## Name of the configMap containing files to be placed under /etc/fluent/config.d/
+## NOTE: This will replace ALL default files in the aforementioned path!
+# extraFilesConfigMapNameOverride: ""
+
+mountVarLogDirectory: true
+mountDockerContainersDirectory: true
+
+volumes: []
+
+volumeMounts: []
 
 ## Only available if kind is StatefulSet
 ## Fluentd persistence
@@ -292,9 +279,9 @@ plugins: []
 
 ## Add fluentd config files from K8s configMaps
 ##
-configMapConfigs:
-  - fluentd-prometheus-conf
-# - fluentd-systemd-conf
+configMapConfigs: []
+#  - fluentd-prometheus-conf
+#  - fluentd-systemd-conf
 
 ## Fluentd configurations:
 ##