Skip to content

Commit

Permalink
[v1.38] backport fix for the jaeger config (#387)
Browse files Browse the repository at this point in the history
* use_grpc by default. health_check_url removal from tracing (#384)

* part of #384 (#385)

Co-authored-by: Xavier Canal i Masjuan <[email protected]>
  • Loading branch information
jmazzitelli and xeviknal authored Aug 4, 2021
1 parent 96b8131 commit 6bebe55
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions deploy/kiali/kiali_cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,6 @@ spec:
# and auth.token config is ignored then.
# username: Username to be used when making requests to Jaeger, for basic authentication. User only requires viewer permissions.
# enabled: When true, connections to Jaeger are enabled. "in_cluster_url" and/or "url" need to be provided.
# health_check_url: Used in the Components health feature. This is the url which kiali will ping to determine whether the component is reachable or not. It defaults to `in_cluster_url` when not provided.
# in_cluster_url: Set URL for in-cluster access, which enables further integration between Kiali and Jaeger.
# When not provided, Kiali will only show external links using the "url" config.
# Note: Jaeger v1.20+ has separated ports for GRPC(16685) and HTTP(16686) requests. Make sure you use the appropriate port according to the "use_grpc" value.
Expand All @@ -652,12 +651,11 @@ spec:
# use_kiali_token: false
# username: ""
# enabled: true
# health_check_url: ""
# in_cluster_url: ""
# is_core: false
# namespace_selector: true
# url: ""
# #use_grpc:
# use_grpc: true
# whitelist_istio_system: ["jaeger-query", "istio-ingressgateway"]

##########
Expand Down
3 changes: 1 addition & 2 deletions roles/default/kiali-deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,11 @@ kiali_defaults:
use_kiali_token: false
username: ""
enabled: true
health_check_url: ""
in_cluster_url: ""
is_core: false
namespace_selector: true
url: ""
#use_grpc:
use_grpc: true
whitelist_istio_system: ["jaeger-query", "istio-ingressgateway"]

health_config:
Expand Down

0 comments on commit 6bebe55

Please sign in to comment.