From af9915e3f63dd3d61d5bd4fc07e9031f51ea929f Mon Sep 17 00:00:00 2001
From: Bob Potter <bobby.potter@gmail.com>
Date: Mon, 23 Apr 2018 18:44:00 -0500
Subject: [PATCH] [incubator/jaeger] support ES_NODES_WAN_ONLY for spark job
 (#4877)

* [incubator/jaeger] support ES_NODES_WAN_ONLY for spark job

Setting this is necessary for the spark job to work against AWS
elasticsearch clusters.

https://github.com/jaegertracing/spark-dependencies#elasticsearch

* [jaeger/incubator] bump version to 0.3.11

* Update common-cm.yaml
---
 incubator/jaeger/Chart.yaml                   | 2 +-
 incubator/jaeger/README.md                    | 1 +
 incubator/jaeger/templates/common-cm.yaml     | 1 +
 incubator/jaeger/templates/spark-cronjob.yaml | 5 +++++
 incubator/jaeger/values.yaml                  | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml
index 06c97d3bc7..ab01e8714e 100644
--- a/incubator/jaeger/Chart.yaml
+++ b/incubator/jaeger/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.2.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.3.10
+version: 0.3.11
 keywords:
   - jaeger
   - opentracing
diff --git a/incubator/jaeger/README.md b/incubator/jaeger/README.md
index c2c3527200..269935d78c 100644
--- a/incubator/jaeger/README.md
+++ b/incubator/jaeger/README.md
@@ -199,6 +199,7 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `storage.elasticsearch.port`             | Provisioned elasticsearch port      |  9200                                  |
 | `storage.elasticsearch.scheme`           | Provisioned elasticsearch scheme    |  http                                  |
 | `storage.elasticsearch.user`             | Provisioned elasticsearch user      |  elastic                               |
+| `storage.elasticsearch.nodesWanOnly`     | Only access specified es host       |  false                                 |
 | `storage.type`                           | Storage type (ES or Cassandra)      |  cassandra                             |
 |------------------------------------------|-------------------------------------|----------------------------------------|
 
diff --git a/incubator/jaeger/templates/common-cm.yaml b/incubator/jaeger/templates/common-cm.yaml
index 8f114b5534..cde4c1c5dc 100644
--- a/incubator/jaeger/templates/common-cm.yaml
+++ b/incubator/jaeger/templates/common-cm.yaml
@@ -22,6 +22,7 @@ data:
   es.password: {{ .Values.storage.elasticsearch.password }}
   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: {{ template "jaeger.hotrod.tracing.host" . }}
   hotrod.agent-port: {{ .Values.hotrod.tracing.port | quote }}
   span-storage.type: {{ .Values.storage.type | quote }}
diff --git a/incubator/jaeger/templates/spark-cronjob.yaml b/incubator/jaeger/templates/spark-cronjob.yaml
index 6d6c39d395..950299ac23 100644
--- a/incubator/jaeger/templates/spark-cronjob.yaml
+++ b/incubator/jaeger/templates/spark-cronjob.yaml
@@ -62,6 +62,11 @@ spec:
                 configMapKeyRef:
                   name: {{ template "jaeger.fullname" . }}
                   key: es.server-urls
+            - name: ES_NODES_WAN_ONLY
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "jaeger.fullname" . }}
+                  key: es.nodes-wan-only
             - name: ES_PASSWORD
               valueFrom:
                 configMapKeyRef:
diff --git a/incubator/jaeger/values.yaml b/incubator/jaeger/values.yaml
index 941838fcd5..0a64f226b3 100644
--- a/incubator/jaeger/values.yaml
+++ b/incubator/jaeger/values.yaml
@@ -20,6 +20,7 @@ storage:
     port: 9200
     user: elastic
     password: changeme
+    nodesWanOnly: false
 
 # Begin: Override values on the Cassandra subchart to customize for Jaeger
 cassandra: