Fix various elasticsearch usage issues

Signed-off-by: Steven Erb <stevenpc3@live.com>

Author: Stevenpc3

charts/jaeger/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 2.14.1
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 4.3.4
+version: 4.3.5
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:

charts/jaeger/README.md

@@ -59,6 +59,16 @@ helm install jaeger jaegertracing/jaeger
 ### 2. Elasticsearch (Production Recommended)
 Configure Jaeger to connect to Elasticsearch using the native config syntax.
 
+Adding memory to ANY storage will cause jeager to use memory.  To completely override and NOT use memory please use 'userconfig' to completely override if using external storage
+
+    This chart defaults to using memory
+
+You can use an internal provisioned Elasticsearch by setting ```provisionDataStore.elasticsearch=true```
+
+The internal elasticsearch is configured to __NOT__ require a password or username.
+
+You can also set up to use an external elasticsearch by changing the ```server_urls``` value.
+
 **values.yaml Example:**
 ```yaml
 # Use the provisioned Elasticsearch subchart
@@ -73,17 +83,22 @@ config:
         primary_store:
           elasticsearch:
             server_urls: ["http://elasticsearch:9200"]
-            username: elastic
-            password: changeme
+            auth:
+              basic:
+                username: elastic
+                password: changeme
 ```
 
 **Running Maintenance Jobs:**
-To run Index Cleaner or Rollover jobs, enable them. They auto-configure when `provisionDataStore.elasticsearch` is enabled:
+To run Index Cleaner or Rollover jobs, enable them. They require configuration if using external by setting ```storage.type=elasticsearch``` and adjusting ```storage.elasticsearch``` values.  See that section in values.yaml for more details.
+
 ```yaml
 esIndexCleaner:
   enabled: true
 ```
 
+* es-rollover __requires__ elasticsearch to be running __BEFORE__ install so the hook job can run.
+
 ### 3. Cassandra
 This chart does not provision a Cassandra cluster. To use Cassandra storage, you must provide your own Cassandra instance and configure Jaeger via the native config syntax:
 
@@ -110,14 +125,16 @@ config:
 
 ### 4. Spark Dependencies
 
-To run the Spark dependencies job (for dependency links graph):
+To run the Spark dependencies job (for dependency links graph) set ```spark.enabled=true```
+
+Below is an example of how to set overrides.  Please see the values.yaml for more examples:
+
+The values are populated under ```storage.elasticsearch``` Please see comments in values.yaml for more details.
 
 ```yaml
 spark:
   enabled: true
   extraEnv:
-    - name: ES_NODES
-      value: http://elasticsearch:9200
     - name: ES_NODES_WAN_ONLY
       value: "true"
 ```

charts/jaeger/templates/_helpers.tpl

@@ -233,24 +233,21 @@ Elasticsearch related environment variables
 {{- define "elasticsearch.env" -}}
 {{- if or .Values.provisionDataStore.elasticsearch (eq .Values.storage.type "elasticsearch") -}}
 {{- $es := .Values.storage.elasticsearch | default dict -}}
-{{- $scheme := $es.scheme | default "http" -}}
-{{- $port := $es.port | default 9200 -}}
 {{- $user := $es.user | default "elastic" -}}
-{{- $password := .Values.elasticsearch.secret.password | default "changeme" -}}
+{{- $password := $es.password | default "changeme" -}}
+{{- $url := $es.url | default "http://elasticsearch-master:9200" -}}
 - name: ES_SERVER_URLS
-  value: "{{ $scheme }}://elasticsearch-master:{{ $port }}"
+  value: {{ $url | quote }}
+- name: ES_NODES
+  value: {{ $url | quote }}
 - name: ES_USERNAME
   value: {{ $user | quote }}
 - name: ES_PASSWORD
   value: {{ $password | quote }}
 {{- /* Handle TLS insecurity */ -}}
-{{- if or ( and $es.tls ( $es.tls.insecure ) ) ( eq $scheme "https" ) }}
-  {{- if $es.tls }}
-    {{- if $es.tls.insecure }}
+{{- if and (($es).tls).enabled (($es).tls).insecure }}
 - name: ES_TLS_SKIP_HOST_VERIFY
   value: "true"
-    {{- end }}
-  {{- end }}
 {{- end }}
 {{- end }}
 {{- end -}}