[jaeger] Simplify anonymous ES access by removing defaults from helper

Remove the `anonymous` flag and hardcoded default credentials from the
elasticsearch.env helper. ES_USERNAME and ES_PASSWORD are now only
injected when `storage.elasticsearch.user` and `storage.elasticsearch.password`
are explicitly set. Omitting them gives anonymous access.

Signed-off-by: Oliver Domokos <domolitom@gmail.com>

Author: domolitom

charts/jaeger/README.md

@@ -114,7 +114,6 @@ storage:
     tls:
       enabled: false
     url: http://elasticsearch-master:9200
-    anonymous: false # Set to true to skip injecting ES_USERNAME/ES_PASSWORD (e.g. for AWS OpenSearch with VPC-level access)
     # user: elastic
     # password: changeme
 ```

charts/jaeger/templates/_helpers.tpl

@@ -182,19 +182,19 @@ Elasticsearch related environment variables
 {{- define "elasticsearch.env" -}}
 {{- if eq .Values.storage.type "elasticsearch" -}}
 {{- $es := .Values.storage.elasticsearch | default dict -}}
-{{- $user := $es.user | default "elastic" -}}
-{{- $password := $es.password | default "changeme" -}}
-{{- $url := $es.url | default "http://elasticsearch-master:9200" -}}
+{{- if $es.user }}
+- name: ES_USERNAME
+  value: {{ $es.user | quote }}
+{{- end }}
+{{- if $es.password }}
+- name: ES_PASSWORD
+  value: {{ $es.password | quote }}
+{{- end }}
+{{ $url := $es.url | default "http://elasticsearch-master:9200" -}}
 - name: ES_SERVER_URLS
   value: {{ $url | quote }}
 - name: ES_NODES
   value: {{ $url | quote }}
-{{- if not $es.anonymous }}
-- name: ES_USERNAME
-  value: {{ $user | quote }}
-- name: ES_PASSWORD
-  value: {{ $password | quote }}
-{{- end }}
 {{- /* Handle TLS insecurity */ -}}
 {{- if and (($es).tls).enabled (($es).tls).insecure }}
 - name: ES_TLS_SKIP_HOST_VERIFY

charts/jaeger/values.yaml

@@ -268,7 +268,6 @@ storage:
       mountPath: ""
       subPath: ""
     url: http://elasticsearch-master:9200
-    anonymous: false
     # user: elastic
     # password: changeme