Merge pull request #45 from arpitjindal97/master

Added cassandra auth variables in spark job

Author: Naseem

charts/jaeger/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.16.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.19.2
+version: 0.19.3
 keywords:
   - jaeger
   - opentracing

charts/jaeger/templates/_helpers.tpl

@@ -218,13 +218,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $host := printf "%s" .Values.storage.elasticsearch.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme $host $port }}
 {{- else }}
-{{- $host := printf "%s-%s-%s" .Release.Name "elasticsearch" "client" | trunc 63 | trimSuffix "-" -}}
-{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme $host $port }}
-{{- end -}}
-{{- else }}
 {{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme .Values.storage.elasticsearch.host $port }}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "jaeger.hotrod.tracing.host" -}}
 {{- default (include "jaeger.agent.name" .) .Values.hotrod.tracing.host -}}

charts/jaeger/templates/spark-cronjob.yaml

@@ -31,13 +31,26 @@ spec:
             image: {{ .Values.spark.image }}:{{ .Values.spark.tag }}
             imagePullPolicy: {{ .Values.spark.pullPolicy }}
             env:
+            {{- range $key, $value := .Values.spark.cmdlineParams }}
+            - name: {{ $key | replace "." "_" | replace "-" "_" | upper | quote }}
+            value: {{ $value | quote }}
+            {{- end }}
             - name: STORAGE
               value: {{ .Values.storage.type }}
             {{- if eq .Values.storage.type "cassandra" }}
             - name: CASSANDRA_CONTACT_POINTS
               value: {{ template "cassandra.contact_points" . }}
             - name: CASSANDRA_KEYSPACE
               value: {{ .Values.storage.cassandra.keyspace }}
+            {{- if .Values.storage.cassandra.usePassword }}
+            - name: CASSANDRA_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
+                  key: password
+            {{- end }}
+            - name: CASSANDRA_USERNAME
+              value: {{ .Values.storage.cassandra.user }}
             {{- end }}
             {{- if eq .Values.storage.type "elasticsearch" }}
             - name: ES_NODES

charts/jaeger/values.yaml

@@ -345,6 +345,7 @@ spark:
   image: jaegertracing/spark-dependencies
   tag: latest
   pullPolicy: Always
+  cmdlineParams: {}
   schedule: "49 23 * * *"
   successfulJobsHistoryLimit: 5
   failedJobsHistoryLimit: 5