Assume no TLS for trace exporting by default

nano-byte · May 13, 2024 · 4243248 · 4243248
1 parent d0c1bcd
commit 4243248
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/charts/generic-service/README.md b/charts/generic-service/README.md
@@ -138,6 +138,7 @@ app:
 | `tracing.enabled`                               | `false`                     | Enables tracing with OpenTelemetry or Jaeger agent (injected as sidecar)                                 |
 | `tracing.probability`                           | `1`                         | Probability of any single trace being sampled; can be overridden for incoming requests e.g. via Istio    |
 | `tracing.class`                                 |                             | Custom value to set for tracing sidecar injection annotations                                            |
+| `tracing.insecure`                              | `true`                      | Use insecure connections (without TLS) to tracing endpoints in local sidecar container                   |  
 | `monitoring.enabled`                            | `false`                     | Use Prometheus for monitoring / metrics scraping                                                         |
 | `monitoring.port`                               | `9100`                      | The port to be scraped for monitoring data                                                               |
 | `monitoring.path`                               | `/metrics`                  | The path to be scraped for monitoring data                                                               |

diff --git a/charts/generic-service/templates/controller.yaml b/charts/generic-service/templates/controller.yaml
@@ -400,6 +400,8 @@ spec:
             - name: JAEGER_SERVICE_NAME
               value: {{ include "generic-service.fullname" . }}
             {{- end }}
+            - name: OTEL_EXPORTER_OTLP_INSECURE
+              value: {{ .Values.tracing.insecure | quote }}
             - name: OTEL_RESOURCE_ATTRIBUTES
               value: 'service.namespace={{ .Release.Namespace }},service.version={{ .Values.version | default .Values.image.tag }},service.instance.id=$(POD_NAME),k8s.node.name=$(NODE_NAME)'
             {{- if ne (float64 .Values.tracing.probability) 1.0 }}

diff --git a/charts/generic-service/values.schema.json b/charts/generic-service/values.schema.json
@@ -747,6 +747,11 @@
           "type": "string",
           "default": "true",
           "description": "Custom value to set for tracing sidecar injection annotations"
+        },
+        "insecure": {
+          "type": "boolean",
+          "default": true,
+          "description": "By default if tracing is enabled, a sidecar is injected without TLS. Set this to false, if the sidecar serves the tracing endpoints via TLS."
         }
       },
       "additionalProperties": false

diff --git a/charts/generic-service/values.yaml b/charts/generic-service/values.yaml
@@ -144,6 +144,7 @@ tracing:
   enabled: false
   probability: 1
   class: ''
+  insecure: true
 
 monitoring:
   enabled: false