github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set elasticsearch password only if used (#15367)

Browse Source 
Signed-off-by: Naseem <naseemkullah@gmail.com>
This commit is contained in:
Naseem
2019-07-09 14:38:25 -07:00
committed by Kubernetes Prow Robot
parent d85e750715
commit 4c8a492117
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
incubator/jaeger/Chart.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.13.1
description: A Jaeger Helm chart for Kubernetes
name: jaeger
version: 0.12.0
version: 0.12.1
keywords:
- jaeger
- opentracing
incubator/jaeger/templates/collector-deploy.yaml
+2
View File
@@ -70,11 +70,13 @@ spec:
key: password
{{- end }}
{{- if eq .Values.storage.type "elasticsearch" }}
{{- if eq .Values.storage.elasticsearch.usePassword }}
- name: ES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
key: password
{{- end }}
- name: ES_SERVER_URLS
value: {{ template "elasticsearch.client.url" . }}
- name: ES_USERNAME
incubator/jaeger/templates/query-deploy.yaml
+2
View File
@@ -70,11 +70,13 @@ spec:
key: password
{{- end }}
{{- if eq .Values.storage.type "elasticsearch" }}
{{- if eq .Values.storage.elasticsearch.usePassword }}
- name: ES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
key: password
{{- end }}
- name: ES_SERVER_URLS
value: {{ template "elasticsearch.client.url" . }}
- name: ES_USERNAME
incubator/jaeger/templates/spark-cronjob.yaml
+2
View File
@@ -54,11 +54,13 @@ spec:
value: {{ template "elasticsearch.client.url" . }}
- name: ES_NODES_WAN_ONLY
value: {{ .Values.storage.elasticsearch.nodesWanOnly | quote }}
{{- if eq .Values.storage.elasticsearch.usePassword }}
- name: ES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
key: password
{{- end }}
- name: ES_USERNAME
value: {{ .Values.storage.elasticsearch.user }}
{{- end }}