From 39b30b5a042198fc749e21c38ab78589f3ddf90f Mon Sep 17 00:00:00 2001 From: Pavel Dmytrenko Date: Wed, 15 Jul 2020 20:12:37 +0300 Subject: [PATCH] [stable/fluentd] Add podLabels (#23169) * [stable/fluentd] Add support for podLabels Signed-off-by: Pavel Dmytrenko * [stable/fluentd] Bump chart version Signed-off-by: Pavel Dmytrenko * [stable/fluentd] Update README Signed-off-by: Pavel Dmytrenko * [stable/fluentd] Rename labels property Signed-off-by: Pavel Dmytrenko --- stable/fluentd/Chart.yaml | 2 +- stable/fluentd/README.md | 1 + stable/fluentd/templates/deployment.yaml | 3 +++ stable/fluentd/values.yaml | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stable/fluentd/Chart.yaml b/stable/fluentd/Chart.yaml index 148d30fb32..37730f36a7 100644 --- a/stable/fluentd/Chart.yaml +++ b/stable/fluentd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: A Fluentd Elasticsearch Helm chart for Kubernetes. icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png name: fluentd -version: 2.4.3 +version: 2.5.0 appVersion: v2.4.0 home: https://www.fluentd.org/ sources: diff --git a/stable/fluentd/README.md b/stable/fluentd/README.md index 20fafd7d2b..a2cc4207b9 100644 --- a/stable/fluentd/README.md +++ b/stable/fluentd/README.md @@ -53,6 +53,7 @@ Parameter | Description | Default `output.sslVersion` | output ssl version | `TLSv1` `output.buffer_chunk_limit` | output buffer chunk limit | `2M` `output.buffer_queue_limit` | output buffer queue limit | `8` +`deployment.labels` | Additional labels for pods | `{}` `image.pullPolicy` | Image pull policy | `IfNotPresent` `image.repository` | Image repository | `gcr.io/google-containers/fluentd-elasticsearch` `image.tag` | Image tag | `v2.4.0` diff --git a/stable/fluentd/templates/deployment.yaml b/stable/fluentd/templates/deployment.yaml index 809e5b3a46..7afd466547 100644 --- a/stable/fluentd/templates/deployment.yaml +++ b/stable/fluentd/templates/deployment.yaml @@ -32,6 +32,9 @@ spec: labels: app: {{ template "fluentd.name" . }} release: {{ .Release.Name }} +{{- with .Values.deployment.labels }} +{{ toYaml . | indent 8 }} +{{- end }} annotations: checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- if .Values.annotations }} diff --git a/stable/fluentd/values.yaml b/stable/fluentd/values.yaml index bedebaacbd..7119dae67c 100644 --- a/stable/fluentd/values.yaml +++ b/stable/fluentd/values.yaml @@ -68,6 +68,10 @@ annotations: {} # prometheus.io/scrape: "true" # prometheus.io/port: "24231" +# Pod Labels +deployment: + labels: {} + ingress: enabled: false annotations: