[installer, helm] Ensure jaeger is disabled by default

gitpod-io · Feb 14, 2022 · f3db54d · f3db54d
1 parent fa15397
commit f3db54d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -272,6 +272,9 @@ env:
   value: {{ $tracing.samplerType }}
 - name: JAEGER_SAMPLER_PARAM
   value: "{{ $tracing.samplerParam }}"
+{{- else }}
+- name: JAEGER_DISABLED
+  value: "true"
 {{- end }}
 {{- end -}}
 

diff --git a/installer/pkg/common/common.go b/installer/pkg/common/common.go
@@ -68,6 +68,7 @@ func DefaultEnv(cfg *config.Config) []corev1.EnvVar {
 
 func TracingEnv(context *RenderContext) (res []corev1.EnvVar) {
 	if context.Config.Observability.Tracing == nil {
+		res = append(res, corev1.EnvVar{Name: "JAEGER_DISABLED", Value: "true"})
 		return
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,7 @@ func DefaultEnv(cfg *config.Config) []corev1.EnvVar { @@
     func TracingEnv(context *RenderContext) (res []corev1.EnvVar) {
     	if context.Config.Observability.Tracing == nil {
+    		res = append(res, corev1.EnvVar{Name: "JAEGER_DISABLED", Value: "true"})
     		return
     	}
@@ Expand Down @@