Helm: fix issue with config.clients (grafana#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 <sandeep.d.sukhani@gmail.com> Co-authored-by: Sandeep Sukhani <sandeep.d.sukhani@gmail.com>
mraboosk · Jan 9, 2020 · 88d0519 · 88d0519
1 parent 3b7fbb3
commit 88d0519
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 }}
-