From f403d40630e0d361ac6d7161e263cfe6c838a629 Mon Sep 17 00:00:00 2001 From: Stefan Andres Date: Mon, 6 Apr 2020 15:08:36 +0200 Subject: [PATCH] [helm loki/promtail] make UpdateStrategy configurable (#1898) This commit makes UpdateStrategy of the promtail daemonset configurable. On large installations, you may want to increase the value of maxUnavailable. This fixes https://github.com/grafana/loki/issues/1878 --- charts/loki-stack/Chart.yaml | 2 +- charts/promtail/Chart.yaml | 2 +- charts/promtail/templates/daemonset.yaml | 5 +---- charts/promtail/values.yaml | 7 ++++++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/charts/loki-stack/Chart.yaml b/charts/loki-stack/Chart.yaml index ed3ebc7ef0..9150eb9901 100644 --- a/charts/loki-stack/Chart.yaml +++ b/charts/loki-stack/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: loki-stack -version: 0.34.0 +version: 0.34.1 appVersion: v1.4.0 kubeVersion: "^1.10.0-0" description: "Loki: like Prometheus, but for logs." diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 3dec7c8f36..79fec8a1b5 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: promtail -version: 0.20.0 +version: 0.20.1 appVersion: v1.4.0 kubeVersion: "^1.10.0-0" description: "Responsible for gathering logs and sending them to Loki" diff --git a/charts/promtail/templates/daemonset.yaml b/charts/promtail/templates/daemonset.yaml index 03728c3bd3..8a9cee4dc2 100644 --- a/charts/promtail/templates/daemonset.yaml +++ b/charts/promtail/templates/daemonset.yaml @@ -16,10 +16,7 @@ spec: app: {{ template "promtail.name" . }} release: {{ .Release.Name }} updateStrategy: - type: {{ .Values.deploymentStrategy }} - {{- if ne .Values.deploymentStrategy "RollingUpdate" }} - rollingUpdate: null - {{- end }} + {{- toYaml .Values.deploymentStrategy | nindent 4 }} template: metadata: labels: diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml index 84286f6520..559888645a 100644 --- a/charts/promtail/values.yaml +++ b/charts/promtail/values.yaml @@ -4,7 +4,12 @@ affinity: {} annotations: {} -deploymentStrategy: RollingUpdate +# The update strategy to apply to the DaemonSet +## +deploymentStrategy: {} +# rollingUpdate: +# maxUnavailable: 1 +# type: RollingUpdate initContainer: enabled: false