From dd470b9385b6d64b0d0f6aa9c5290fafca4eed64 Mon Sep 17 00:00:00 2001
From: Naseem <naseemkullah@gmail.com>
Date: Thu, 11 Jul 2019 00:58:53 -0400
Subject: [PATCH] Fix es password logic (#15413)

Signed-off-by: Naseem <naseemkullah@gmail.com>
---
 incubator/jaeger/Chart.yaml                      | 2 +-
 incubator/jaeger/templates/collector-deploy.yaml | 2 +-
 incubator/jaeger/templates/query-deploy.yaml     | 2 +-
 incubator/jaeger/templates/spark-cronjob.yaml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml
index 847845e0a7..2df08ccd43 100644
--- a/incubator/jaeger/Chart.yaml
+++ b/incubator/jaeger/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.13.1
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.12.1
+version: 0.12.2
 keywords:
   - jaeger
   - opentracing
diff --git a/incubator/jaeger/templates/collector-deploy.yaml b/incubator/jaeger/templates/collector-deploy.yaml
index df7fbb62f2..ae594c5ea1 100644
--- a/incubator/jaeger/templates/collector-deploy.yaml
+++ b/incubator/jaeger/templates/collector-deploy.yaml
@@ -70,7 +70,7 @@ spec:
                 key: password
           {{- end }}
           {{- if eq .Values.storage.type "elasticsearch" }}
-          {{- if eq .Values.storage.elasticsearch.usePassword }}
+          {{- if .Values.storage.elasticsearch.usePassword }}
           - name: ES_PASSWORD
             valueFrom:
               secretKeyRef:
diff --git a/incubator/jaeger/templates/query-deploy.yaml b/incubator/jaeger/templates/query-deploy.yaml
index 69bd7032f5..587c927ad1 100644
--- a/incubator/jaeger/templates/query-deploy.yaml
+++ b/incubator/jaeger/templates/query-deploy.yaml
@@ -70,7 +70,7 @@ spec:
                 key: password
           {{- end }}
           {{- if eq .Values.storage.type "elasticsearch" }}
-          {{- if eq .Values.storage.elasticsearch.usePassword }}
+          {{- if .Values.storage.elasticsearch.usePassword }}
           - name: ES_PASSWORD
             valueFrom:
               secretKeyRef:
diff --git a/incubator/jaeger/templates/spark-cronjob.yaml b/incubator/jaeger/templates/spark-cronjob.yaml
index a0d82e310c..def17fc16b 100644
--- a/incubator/jaeger/templates/spark-cronjob.yaml
+++ b/incubator/jaeger/templates/spark-cronjob.yaml
@@ -54,7 +54,7 @@ spec:
               value: {{ template "elasticsearch.client.url" . }}
             - name: ES_NODES_WAN_ONLY
               value: {{ .Values.storage.elasticsearch.nodesWanOnly | quote }}
-            {{- if eq .Values.storage.elasticsearch.usePassword }}
+            {{- if .Values.storage.elasticsearch.usePassword }}
             - name: ES_PASSWORD
               valueFrom:
                 secretKeyRef: