Merge pull request #47 from cgroschupp/feat/fix-external-es

Allow to use external es host

Author: Naseem

charts/jaeger/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.16.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.19.4
+version: 0.19.5
 keywords:
   - jaeger
   - opentracing

charts/jaeger/templates/_helpers.tpl

@@ -213,20 +213,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "elasticsearch.client.url" -}}
 {{- $port := .Values.storage.elasticsearch.port | toString -}}
-{{- if .Values.provisionDataStore.elasticsearch -}}
-{{- if .Values.storage.elasticsearch.nameOverride }}
-{{- $host := printf "%s" .Values.storage.elasticsearch.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme $host $port }}
-{{- else }}
 {{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme .Values.storage.elasticsearch.host $port }}
 {{- end -}}
-{{- end -}}
-{{- end -}}
 
 {{- define "jaeger.hotrod.tracing.host" -}}
 {{- default (include "jaeger.agent.name" .) .Values.hotrod.tracing.host -}}
 {{- end -}}
 
+
 {{/*
 Configure list of IP CIDRs allowed access to load balancer (if supported)
 */}}