add override options for configuration via values.yaml

Author: DaedalusG

charts/sourcegraph/README.md

@@ -162,6 +162,7 @@ In addition to the documented values, all services also support the following va
 | jaeger.collector.serviceAnnotations | object | `{}` | Add extra annotations to jaeger `collector` service |
 | jaeger.collector.serviceLabels | object | `{}` | Add extra labels to jaeger `collector` service |
 | jaeger.collector.serviceType | string | "ClusterIP" | Kubernetes service type of jaeger `collector` service, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) |
+| jaeger.config | object | `{"exporters":{"jaeger_storage_exporter":{"trace_storage":"main_store"}},"extensions":{"healthcheckv2":{"http":{"endpoint":"0.0.0.0:13133"},"use_v2":true},"jaeger_query":{"base_path":"/-/debug/jaeger","http":{"endpoint":"0.0.0.0:16686"},"storage":{"traces":"main_store"}},"jaeger_storage":{"backends":{"main_store":{"memory":{"max_traces":20000}}}},"remote_sampling":{"file":{"default_sampling_probability":1,"path":"/etc/jaeger/sampling_strategies.json"},"http":{"endpoint":"0.0.0.0:5778"}}},"processors":{"batch":{}},"receivers":{"otlp":{"protocols":{"grpc":{"endpoint":"0.0.0.0:4317"},"http":{"endpoint":"0.0.0.0:4318"}}}},"service":{"extensions":["jaeger_storage","jaeger_query","remote_sampling","healthcheckv2"],"pipelines":{"traces":{"exporters":["jaeger_storage_exporter"],"processors":["batch"],"receivers":["otlp"]}},"telemetry":{"logs":{"level":"info"}}}}` | Jaeger v2 YAML configuration. This is rendered into a ConfigMap and mounted at `/etc/jaeger/jaeger-config.yaml`. Customers can override individual settings (e.g., `max_traces`, sampling) directly in values.yaml. See https://www.jaegertracing.io/docs/2.16/configuration/ |
 | jaeger.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":101,"runAsUser":100}` | Security context for the `jaeger` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
 | jaeger.enabled | bool | `false` | Enable `jaeger` |
 | jaeger.image.defaultTag | string | `"6.0.0@sha256:79548aa11d7e2e6bf3e2012fb9e046df12ba5c5410bc24ec8f4d7cbb880336b9"` | Docker image tag for the `jaeger` image |

charts/sourcegraph/templates/jaeger/jaeger.ConfigMap.yaml

@@ -0,0 +1,14 @@
+{{- if .Values.jaeger.enabled -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "sourcegraph.jaeger.labels" . | nindent 4 }}
+    deploy: sourcegraph
+    app.kubernetes.io/component: all-in-one
+    app: jaeger
+  name: {{ .Values.jaeger.name }}
+data:
+  jaeger-config.yaml: |
+    {{- toYaml .Values.jaeger.config | nindent 4 }}
+{{- end }}

charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml

@@ -30,6 +30,7 @@ spec:
         kubectl.kubernetes.io/default-container: jaeger
         prometheus.io/port: "16686"
         sourcegraph.prometheus/scrape: "true"
+        checksum/jaeger-config: {{ toYaml .Values.jaeger.config | sha256sum }}
       {{- if .Values.sourcegraph.podAnnotations }}
       {{- toYaml .Values.sourcegraph.podAnnotations | nindent 8 }}
       {{- end }}
@@ -86,6 +87,10 @@ spec:
         securityContext:
           {{- toYaml .Values.jaeger.containerSecurityContext | nindent 10 }}
         volumeMounts:
+        - name: jaeger-config
+          mountPath: /etc/jaeger/jaeger-config.yaml
+          subPath: jaeger-config.yaml
+          readOnly: true
         {{- if .Values.jaeger.extraVolumeMounts }}
         {{- toYaml .Values.jaeger.extraVolumeMounts | nindent 8 }}
         {{- end }}
@@ -104,6 +109,12 @@ spec:
       {{- end }}
       {{- include "sourcegraph.renderServiceAccountName" (list . "jaeger") | trim | nindent 6 }}
       volumes:
+      - name: jaeger-config
+        configMap:
+          name: {{ .Values.jaeger.name }}
+          items:
+          - key: jaeger-config.yaml
+            path: jaeger-config.yaml
       {{- if .Values.jaeger.extraVolumes }}
       {{- toYaml .Values.jaeger.extraVolumes | nindent 6 }}
       {{- end }}

charts/sourcegraph/values.yaml

@@ -1183,6 +1183,55 @@ jaeger:
     [
       "--config=/etc/jaeger/jaeger-config.yaml",
     ]
+  # -- Jaeger v2 YAML configuration. This is rendered into a ConfigMap and
+  # mounted at `/etc/jaeger/jaeger-config.yaml`. Customers can override
+  # individual settings (e.g., `max_traces`, sampling) directly in values.yaml.
+  # See https://www.jaegertracing.io/docs/2.16/configuration/
+  config:
+    service:
+      extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+      pipelines:
+        traces:
+          receivers: [otlp]
+          processors: [batch]
+          exporters: [jaeger_storage_exporter]
+      telemetry:
+        logs:
+          level: info
+    extensions:
+      healthcheckv2:
+        use_v2: true
+        http:
+          endpoint: "0.0.0.0:13133"
+      jaeger_storage:
+        backends:
+          main_store:
+            memory:
+              max_traces: 20000
+      jaeger_query:
+        storage:
+          traces: main_store
+        base_path: "/-/debug/jaeger"
+        http:
+          endpoint: "0.0.0.0:16686"
+      remote_sampling:
+        file:
+          path: /etc/jaeger/sampling_strategies.json
+          default_sampling_probability: 1.0
+        http:
+          endpoint: "0.0.0.0:5778"
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: "0.0.0.0:4317"
+          http:
+            endpoint: "0.0.0.0:4318"
+    processors:
+      batch: {}
+    exporters:
+      jaeger_storage_exporter:
+        trace_storage: main_store
   # -- Security context for the `jaeger` container,
   # learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container)
   containerSecurityContext: