Merge pull request #31 from arpitjindal97/master

Added flexibility to change keyspace to the users
jaegertracing · Jan 18, 2020 · b9c3015 · b9c3015
2 parents 515b15e + 2d97f23
commit b9c3015
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/charts/jaeger/Chart.yaml b/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.18.4
+version: 0.18.5
 keywords:
   - jaeger
   - opentracing

diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md
@@ -273,6 +273,7 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `spark.tag` | Tag of the dependencies job image | `latest` |
 | `storage.cassandra.existingSecret` | Name of existing password secret object (for password authentication | `nil`
 | `storage.cassandra.host` | Provisioned cassandra host | `cassandra` |
+| `storage.cassandra.keyspace` | Schema name for cassandra | `jaeger_v1_test` |
 | `storage.cassandra.password` | Provisioned cassandra password  (ignored if storage.cassandra.existingSecret set) | `password` |
 | `storage.cassandra.port` | Provisioned cassandra port | `9042` |
 | `storage.cassandra.tls.enabled` | Provisioned cassandra TLS connection enabled | `false` |

diff --git a/charts/jaeger/templates/cassandra-schema-job.yaml b/charts/jaeger/templates/cassandra-schema-job.yaml
@@ -46,9 +46,9 @@ spec:
             secretKeyRef:
               name: {{ if .Values.storage.cassandra.existingSecret }}{{ .Values.storage.cassandra.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-cassandra{{- end }}
               key: password
-      {{- if .Values.schema.keyspace }}
+      {{- if .Values.storage.cassandra.keyspace }}
         - name: KEYSPACE
-          value: {{ .Values.schema.keyspace | quote }}
+          value: {{ .Values.storage.cassandra.keyspace | quote }}
       {{- end }}
       {{- if .Values.schema.traceTtl }}
         - name: TRACE_TTL

diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml
@@ -70,8 +70,10 @@ spec:
           - name: CASSANDRA_TLS_CA
             value: "/cassandra-tls/ca-cert.pem"
           {{- end }}
+          {{- if .Values.storage.cassandra.keyspace }}
           - name: CASSANDRA_KEYSPACE
-            value: {{ printf "%s_%s" "jaeger_v1" .Values.cassandra.config.dc_name | quote }}
+            value: {{ .Values.storage.cassandra.keyspace }}
+          {{- end }}
           - name: CASSANDRA_USERNAME
             value: {{ .Values.storage.cassandra.user }}
           - name: CASSANDRA_PASSWORD

diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml
@@ -63,8 +63,10 @@ spec:
           - name: CASSANDRA_TLS_CA
             value: "/cassandra-tls/ca-cert.pem"
           {{- end }}
+          {{- if .Values.storage.cassandra.keyspace }}
           - name: CASSANDRA_KEYSPACE
-            value: {{ printf "%s_%s" "jaeger_v1" .Values.cassandra.config.dc_name | quote }}
+            value: {{ .Values.storage.cassandra.keyspace | quote }}
+          {{- end }}
           - name: CASSANDRA_USERNAME
             value: {{ .Values.storage.cassandra.user }}
           - name: CASSANDRA_PASSWORD
@@ -148,6 +150,12 @@ spec:
           containerPort: 14271
           protocol: TCP
         volumeMounts:
+        {{- range .Values.agent.extraConfigmapMounts }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+            subPath: {{ .subPath }}
+            readOnly: {{ .readOnly }}
+        {{- end }}
         {{- range .Values.agent.extraSecretMounts }}
           - name: {{ .name }}
             mountPath: {{ .mountPath }}
@@ -176,6 +184,11 @@ spec:
           secret:
             secretName: {{ .secretName }}
       {{- end }}
+      {{- range .Values.agent.extraConfigmapMounts }}
+        - name: {{ .name }}
+          configMap:
+            name: {{ .configMap }}
+      {{- end }}
     {{- with .Values.query.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
@@ -23,6 +23,7 @@ storage:
     user: user
     usePassword: true
     password: password
+    keyspace: jaeger_v1_test
     ## Use existing secret (ignores previous password)
     # existingSecret:
   elasticsearch: