diff --git a/incubator/fluentd-cloudwatch/Chart.yaml b/incubator/fluentd-cloudwatch/Chart.yaml index e0cc0fc175..5d5aca2756 100644 --- a/incubator/fluentd-cloudwatch/Chart.yaml +++ b/incubator/fluentd-cloudwatch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: fluentd-cloudwatch -version: 0.12.0 +version: 0.12.1 appVersion: v1.7.3-debian-cloudwatch-1.0 description: A Fluentd CloudWatch Helm chart for Kubernetes. home: https://www.fluentd.org/ diff --git a/incubator/fluentd-cloudwatch/README.md b/incubator/fluentd-cloudwatch/README.md index 1655a56004..5ce2973f0a 100644 --- a/incubator/fluentd-cloudwatch/README.md +++ b/incubator/fluentd-cloudwatch/README.md @@ -67,7 +67,9 @@ The following table lists the configurable parameters of the Fluentd Cloudwatch | `rbac.create` | If true, create & use RBAC resources | `false` | | `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` | | `rbac.pspEnabled` | PodSecuritypolicy | `false` | -| `rbac.serviceAccountAnnotations`| Additional Service Account annotations | `{}` | +| `rbac.serviceAccountAnnotations`| Additional Service Account annotations | `{}` | +| `volumeMounts` | Add volume mounts to daemon set | `[]` | +| `volumes` | Add volumes to daemon set | `[]` | | `tolerations` | Add tolerations | `[]` | | `extraVars` | Add pod environment variables (must be specified as a single line object) | `[]` | | `updateStrategy` | Define daemonset update strategy | `OnDelete` | diff --git a/incubator/fluentd-cloudwatch/templates/daemonset.yaml b/incubator/fluentd-cloudwatch/templates/daemonset.yaml index e1da37a2ff..d681a3cffc 100644 --- a/incubator/fluentd-cloudwatch/templates/daemonset.yaml +++ b/incubator/fluentd-cloudwatch/templates/daemonset.yaml @@ -71,6 +71,11 @@ spec: readOnly: true - name: config mountPath: /fluentd/etc + - name: config-volume + mountPath: /config-volume +{{- if .Values.volumeMounts }} +{{ toYaml .Values.volumeMounts | indent 8 }} +{{- end }} {{- if .Values.priorityClassName }} priorityClassName: "{{ .Values.priorityClassName }}" {{- end }} @@ -87,6 +92,9 @@ spec: - name: config-volume configMap: name: {{ template "fluentd-cloudwatch.fullname" . }} +{{- if .Values.volumes }} +{{ toYaml .Values.volumes | indent 6 }} +{{- end }} {{- if .Values.tolerations }} tolerations: {{ toYaml .Values.tolerations | indent 6 }} diff --git a/incubator/fluentd-cloudwatch/values.yaml b/incubator/fluentd-cloudwatch/values.yaml index ff04116d1a..939a014f19 100644 --- a/incubator/fluentd-cloudwatch/values.yaml +++ b/incubator/fluentd-cloudwatch/values.yaml @@ -40,6 +40,17 @@ nodeSelector: {} # values: # - master affinity: {} + +volumeMounts: [] +# - name: runlogjournal +# mountPath: /run/log/journal +# readOnly: true + +volumes: [] +# - name: runlogjournal +# hostPath: +# path: /run/log/journal + ## Add tolerations if specified tolerations: [] # - key: node-role.kubernetes.io/master