From e58b1db6ce935df57f981ef2e2f6c60169f0e2ec Mon Sep 17 00:00:00 2001 From: Jon Davies Date: Wed, 29 May 2019 20:03:51 +0100 Subject: [PATCH] Helm chart tracing variable fix (#621) * loki chart deployment.yaml: Only set JAEGER_AGENT_HOST if set. * docs/troubleshooting.md: Fixed variable name for chart option. * Bumped loki chart version for variable fix. --- docs/troubleshooting.md | 2 +- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/templates/deployment.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 59046ed9477b..71eb6ce81788 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -83,5 +83,5 @@ We support (jaeger)[https://www.jaegertracing.io/] to trace loki, just add env ` If you deploy with helm, refer to following command: ```bash -$ helm upgrade --install loki loki/loki --set "loki.jaegerAgentHost=YOUR_JAEGER_AGENT_HOST" +$ helm upgrade --install loki loki/loki --set "loki.tracing.jaegerAgentHost=YOUR_JAEGER_AGENT_HOST" ``` diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 13795ee04db8..cf5aab6f2df3 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -1,5 +1,5 @@ name: loki -version: 0.8.4 +version: 0.8.5 appVersion: 0.0.1 kubeVersion: "^1.10.0-0" description: "Loki: like Prometheus, but for logs." diff --git a/production/helm/loki/templates/deployment.yaml b/production/helm/loki/templates/deployment.yaml index 9bf061704449..e8fe9be095c6 100644 --- a/production/helm/loki/templates/deployment.yaml +++ b/production/helm/loki/templates/deployment.yaml @@ -70,8 +70,10 @@ spec: securityContext: readOnlyRootFilesystem: true env: + {{- if .Values.tracing.jaegerAgentHost }} - name: JAEGER_AGENT_HOST value: "{{ .Values.tracing.jaegerAgentHost }}" + {{- end }} nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }} affinity: