Change tracing chart to use tracing.provider to select backend (istio…

…#7120)
cloudfoundry-attic · Jul 22, 2018 · 96bb622 · 96bb622
1 parent 1ce9872
commit 96bb622
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/install/kubernetes/helm/istio/charts/tracing/templates/ingress-jaeger.yaml b/install/kubernetes/helm/istio/charts/tracing/templates/ingress-jaeger.yaml
@@ -1,5 +1,4 @@
-{{- if .Values.jaeger.ingress.enabled -}}
-{{- if .Values.jaeger.enabled -}}
+{{ if (.Values.jaeger.ingress.enabled) and eq .Values.provider "jaeger" }}
 {{- $servicePort := .Values.service.uiPort -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -31,4 +30,3 @@ spec:
 {{ toYaml .Values.jaeger.ingress.tls | indent 4 }}
   {{- end -}}
 {{- end -}}
-{{- end -}}
diff --git a/install/kubernetes/helm/istio/charts/tracing/templates/service-jaeger.yaml b/install/kubernetes/helm/istio/charts/tracing/templates/service-jaeger.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.jaeger.enabled }}
+{{ if eq .Values.provider "jaeger" }}
 
 apiVersion: v1
 kind: List

diff --git a/install/kubernetes/helm/istio/values.yaml b/install/kubernetes/helm/istio/values.yaml
@@ -413,8 +413,8 @@ servicegraph:
 
 tracing:
   enabled: false
+  provider: jaeger
   jaeger:
-    enabled: false
     memory:
       max_traces: 50000
     ingress: