From e2217a8fb0786751a40ac8481810a71d5830c4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Prud=27homme?=
 <sebastien.prudhomme@gmail.com>
Date: Wed, 9 Jan 2019 06:40:07 +0100
Subject: [PATCH] [incubator/jaeger] fix hotrod demo application (#10175)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [incubator/jaeger] fix hotrod demo application

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>

* [incubator/jaeger} bump version

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>
---
 incubator/jaeger/Chart.yaml                   | 2 +-
 incubator/jaeger/templates/_helpers.tpl       | 3 +--
 incubator/jaeger/templates/common-cm.yaml     | 3 ++-
 incubator/jaeger/templates/hotrod-deploy.yaml | 9 +++++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml
index 962e8cd5a3..f8f21a5a0c 100644
--- a/incubator/jaeger/Chart.yaml
+++ b/incubator/jaeger/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.8.2
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.8.1
+version: 0.8.2
 keywords:
   - jaeger
   - opentracing
diff --git a/incubator/jaeger/templates/_helpers.tpl b/incubator/jaeger/templates/_helpers.tpl
index 5f465ef59f..681ad06286 100644
--- a/incubator/jaeger/templates/_helpers.tpl
+++ b/incubator/jaeger/templates/_helpers.tpl
@@ -130,8 +130,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "jaeger.hotrod.tracing.host" -}}
-{{- $host := printf "%s-agent" (include "jaeger.agent.name" .) -}}
-{{- default $host .Values.hotrod.tracing.host -}}
+{{- default (include "jaeger.agent.name" .) .Values.hotrod.tracing.host -}}
 {{- end -}}
 
 {{/*
diff --git a/incubator/jaeger/templates/common-cm.yaml b/incubator/jaeger/templates/common-cm.yaml
index 62bc38d511..e2f0232940 100644
--- a/incubator/jaeger/templates/common-cm.yaml
+++ b/incubator/jaeger/templates/common-cm.yaml
@@ -23,7 +23,8 @@ data:
   es.server-urls: {{ template "elasticsearch.client.url" . }}
   es.username: {{ .Values.storage.elasticsearch.user }}
   es.nodes-wan-only: {{ .Values.storage.elasticsearch.nodesWanOnly | quote }}
-  hotrod.agent-host-port: "{{ template "jaeger.hotrod.tracing.host" . }}:{{ .Values.hotrod.tracing.port }}"
+  hotrod.agent-host: {{ template "jaeger.hotrod.tracing.host" . }}
+  hotrod.agent-port: {{ .Values.hotrod.tracing.port | quote }}
   span-storage.type: {{ .Values.storage.type | quote }}
   query.health-check-http-port: {{ .Values.query.healthCheckPort | quote }}
   query.port: {{ .Values.query.service.targetPort | quote }}
diff --git a/incubator/jaeger/templates/hotrod-deploy.yaml b/incubator/jaeger/templates/hotrod-deploy.yaml
index 89edc4d134..977697d64b 100644
--- a/incubator/jaeger/templates/hotrod-deploy.yaml
+++ b/incubator/jaeger/templates/hotrod-deploy.yaml
@@ -25,11 +25,16 @@ spec:
           image: {{ .Values.hotrod.image.repository }}:{{ .Values.hotrod.image.tag }}
           imagePullPolicy: {{ .Values.hotrod.image.pullPolicy }}
           env:
-            - name: JAEGER_AGENT_HOST_PORT
+            - name: JAEGER_AGENT_HOST
               valueFrom:
                 configMapKeyRef:
                   name: {{ template "jaeger.fullname" . }}
-                  key: hotrod.agent-host-port
+                  key: hotrod.agent-host
+            - name: JAEGER_AGENT_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "jaeger.fullname" . }}
+                  key: hotrod.agent-port
           ports:
             - containerPort: {{ .Values.hotrod.service.internalPort }}
           livenessProbe: