From 109ca194cd3d1fccb8e45703b497b0ba3af1735d Mon Sep 17 00:00:00 2001 From: Scott Stanton Date: Fri, 14 Dec 2018 06:19:03 -0800 Subject: [PATCH] Add extraPorts option (#8945) (#8960) * Add extraPorts option (#8945) Signed-off-by: Scott Stanton * bump version Signed-off-by: Scott Stanton * bump version Signed-off-by: Scott Stanton * fix typo Signed-off-by: Scott Stanton --- stable/fluent-bit/Chart.yaml | 2 +- stable/fluent-bit/README.md | 1 + stable/fluent-bit/templates/daemonset.yaml | 13 +++++++++---- stable/fluent-bit/values.yaml | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index 4bc164dfba..3f2fb5f95d 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,5 +1,5 @@ name: fluent-bit -version: 1.0.3 +version: 1.1.0 appVersion: 0.14.9 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/README.md b/stable/fluent-bit/README.md index b8b8bc9a33..878bf6c14b 100644 --- a/stable/fluent-bit/README.md +++ b/stable/fluent-bit/README.md @@ -83,6 +83,7 @@ The following table lists the configurable parameters of the Fluent-Bit chart an | `extraEntries.input` | Extra entries for existing [INPUT] section | `` | | `extraEntries.filter` | Extra entries for existing [FILTER] section | `` | | `extraEntries.output` | Extra entries for existing [OUPUT] section | `` | +| `extraPorts` | List of extra ports | | | `extraVolumeMounts` | Mount an extra volume, required to mount ssl certificates when elasticsearch has tls enabled | | | `extraVolume` | Extra volume | | | `filter.enableExclude` | Enable the use of monitoring for a pod annotation of `fluentbit.io/exclude: true`. If present, discard logs from that pod. | `true` | diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml index d12f19ad34..e8e1ca6510 100644 --- a/stable/fluent-bit/templates/daemonset.yaml +++ b/stable/fluent-bit/templates/daemonset.yaml @@ -36,11 +36,16 @@ spec: {{ toYaml .Values.env | indent 10 }} resources: {{ toYaml .Values.resources | indent 10 }} -{{- if .Values.metrics.enabled }} +{{- if or .Values.metrics.enabled .Values.extraPorts }} ports: - - name: metrics - containerPort: 2020 - protocol: TCP +{{- if .Values.metrics.enabled }} + - name: metrics + containerPort: 2020 + protocol: TCP +{{- end -}} +{{- if .Values.extraPorts }} +{{ toYaml .Values.extraPorts | indent 8 }} +{{- end }} {{- end }} volumeMounts: - name: varlog diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml index 827ab413bb..245c9e945c 100644 --- a/stable/fluent-bit/values.yaml +++ b/stable/fluent-bit/values.yaml @@ -120,6 +120,9 @@ extraEntries: output: |- # # >=1 additional Key/Value entrie(s) for existing Ouput section +## Extra ports to add to the daemonset ports section +extraPorts: [] + ## Extra volumes containing additional files required for fluent-bit to work ## (eg. CA certificates) ## Ref: https://kubernetes.io/docs/concepts/storage/volumes/