From 88d0519832a9362cc36137048004e73cc9dc48ad Mon Sep 17 00:00:00 2001 From: Yevhen Stolietnii Date: Thu, 9 Jan 2020 23:36:00 +0200 Subject: [PATCH] Helm: fix issue with config.clients (#1431) * Add statement for config.clients * Bump up chart version * Update production/helm/promtail/templates/daemonset.yaml Yeap, make sense. Co-Authored-By: Sandeep Sukhani Co-authored-by: Sandeep Sukhani --- production/helm/promtail/Chart.yaml | 2 +- production/helm/promtail/templates/daemonset.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml index c3deb3559768..6239cab7ec12 100644 --- a/production/helm/promtail/Chart.yaml +++ b/production/helm/promtail/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: promtail -version: 0.16.0 +version: 0.16.1 appVersion: v1.2.0 kubeVersion: "^1.10.0-0" description: "Responsible for gathering logs and sending them to Loki" diff --git a/production/helm/promtail/templates/daemonset.yaml b/production/helm/promtail/templates/daemonset.yaml index 90ad7418c97f..2ca17e32ea2b 100644 --- a/production/helm/promtail/templates/daemonset.yaml +++ b/production/helm/promtail/templates/daemonset.yaml @@ -44,11 +44,13 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} args: - "-config.file=/etc/promtail/promtail.yaml" + {{- if not (or .Values.config.client.url .Values.config.clients) }} {{- if and .Values.loki.user .Values.loki.password }} - "-client.url={{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/loki/api/v1/push" {{- else }} - "-client.url={{ .Values.loki.serviceScheme }}://{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/loki/api/v1/push" {{- end }} + {{- end }} volumeMounts: - name: config mountPath: /etc/promtail @@ -93,4 +95,3 @@ spec: {{- with .Values.volumes }} {{- toYaml . | nindent 8 }} {{- end }} -