From 3b4cdbc88697e13a3dd99e0ce4f5b940c0519e01 Mon Sep 17 00:00:00 2001 From: Maximilian Rink Date: Thu, 21 May 2020 19:57:15 +0200 Subject: [PATCH] [bitnami/logstash] add extraconfigsmaps to logstash helm chart (#2617) * add extraconfigsmaps to logstash helm chart * fix forgotten unneded parameter in values, make description in values more precise * [bitnami/logstash] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/logstash/Chart.yaml | 2 +- bitnami/logstash/README.md | 2 ++ bitnami/logstash/templates/sts.yaml | 6 ++++++ bitnami/logstash/values-production.yaml | 19 +++++++++++++++++-- bitnami/logstash/values.yaml | 20 ++++++++++++++++++-- 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/bitnami/logstash/Chart.yaml b/bitnami/logstash/Chart.yaml index 10d2678297..8965100b8a 100644 --- a/bitnami/logstash/Chart.yaml +++ b/bitnami/logstash/Chart.yaml @@ -14,4 +14,4 @@ maintainers: name: logstash sources: - https://github.com/bitnami/bitnami-docker-logstash -version: 0.3.1 +version: 0.4.0 diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md index 728c2ce417..cecfce8961 100644 --- a/bitnami/logstash/README.md +++ b/bitnami/logstash/README.md @@ -70,6 +70,8 @@ The following tables lists the configurable parameters of the Logstash chart and | `output` | Output Plugins configuration | `Check values.yaml file` | | `existingConfiguration` | Name of existing ConfigMap object with the Logstash configuration (`input`, `filter`, and `output` will be ignored). | `nil` | | `containerPorts` | Array containing the ports to open in the Logstash container | `Check values.yaml file` | +| `extraVolumes` | Array to add extra volumes (evaluated as a template) | `[]` | +| `extraVolumeMounts` | Array to add extra mounts (normally used with extraVolumes, evaluated as a template) | `[]` | | `replicaCount` | The number of Logstash replicas to deploy | `1` | | `updateStrategy` | Update strategy (`RollingUpdate`, or `OnDelete`) | `RollingUpdate` | | `podManagementPolicy` | Pod management policy | `OrderedReady` | diff --git a/bitnami/logstash/templates/sts.yaml b/bitnami/logstash/templates/sts.yaml index 3e2f46cbea..59e7200fb6 100644 --- a/bitnami/logstash/templates/sts.yaml +++ b/bitnami/logstash/templates/sts.yaml @@ -76,6 +76,9 @@ spec: - name: configurations mountPath: /bitnami/logstash/config {{- end }} + {{- if .Values.extraVolumeMounts }} + {{- include "logstash.tplValue" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} {{- if .Values.metrics.enabled }} - name: metrics image: {{ include "logstash.metrics.image" . }} @@ -106,3 +109,6 @@ spec: configMap: name: {{ include "logstash.configmapName" . }} {{- end }} + {{- if .Values.extraVolumes }} + {{- include "logstash.tplValue" ( dict "value" .Values.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} diff --git a/bitnami/logstash/values-production.yaml b/bitnami/logstash/values-production.yaml index a2eab4a20f..267fe49a8d 100644 --- a/bitnami/logstash/values-production.yaml +++ b/bitnami/logstash/values-production.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/logstash - tag: 7.7.0-debian-10-r0 + tag: 7.7.0-debian-10-r8 ## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -102,6 +102,21 @@ output: |- ## # existingConfiguration: +## Array to add extra volumes (evaluated as a template) +## extraVolumes: +## - name: myvolume +## configMap: +## name: myconfigmap +extraVolumes: [] + +## Array to add extra mounts (normally used with extraVolumes, evaluated as a template) +## +## extraVolumeMounts: +## - mountPath: /opt/bitnami/desired-path +## name: myvolume +## readOnly: true +extraVolumeMounts: [] + containerPorts: # - name: syslog-udp # containerPort: 1514 @@ -290,7 +305,7 @@ metrics: image: registry: docker.io repository: bitnami/logstash-exporter - tag: 0.1.2-debian-10-r111 + tag: 0.1.2-debian-10-r119 ## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## diff --git a/bitnami/logstash/values.yaml b/bitnami/logstash/values.yaml index 7ecb6363cd..24f0708442 100644 --- a/bitnami/logstash/values.yaml +++ b/bitnami/logstash/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/logstash - tag: 7.7.0-debian-10-r0 + tag: 7.7.0-debian-10-r8 ## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -102,6 +102,22 @@ output: |- ## # existingConfiguration: + +## Array to add extra volumes (evaluated as a template) +## extraVolumes: +## - name: myvolume +## configMap: +## name: myconfigmap +extraVolumes: [] + +## Array to add extra mounts (normally used with extraVolumes, evaluated as a template) +## +## extraVolumeMounts: +## - mountPath: /opt/bitnami/desired-path +## name: myvolume +## readOnly: true +extraVolumeMounts: [] + containerPorts: # - name: syslog-udp # containerPort: 1514 @@ -290,7 +306,7 @@ metrics: image: registry: docker.io repository: bitnami/logstash-exporter - tag: 0.1.2-debian-10-r111 + tag: 0.1.2-debian-10-r119 ## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ##