Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix tracer value handling #932

Merged
merged 1 commit into from
Jan 31, 2024
Merged

fix tracer value handling #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/assets/manifests/istio-discovery/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
image:
imageType: {{. | quote}}
{{- end }}
{{- if ne .Values.global.proxy.tracer "" }}
{{- if and (ne .Values.global.proxy.tracer "") .Values.global.proxy.tracer }}
tracing:
{{- if eq .Values.global.proxy.tracer "lightstep" }}
lightstep:
Expand Down
2 changes: 1 addition & 1 deletion internal/assets/manifests/istio-discovery/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ global:

# Specify which tracer to use. One of: zipkin, lightstep, datadog, stackdriver.
# If using stackdriver tracer outside GCP, set env GOOGLE_APPLICATION_CREDENTIALS to the GCP credential file.
tracer: "zipkin"
# tracer: "zipkin"

# Controls if sidecar is injected at the front of the container list and blocks the start of the other containers until the proxy is ready
holdApplicationUntilProxyStarts: false
Expand Down
6 changes: 5 additions & 1 deletion internal/assets/manifests/istio-discovery/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,13 @@ logLevel: {{ .GetSpec.GetProxy.GetLogLevel | toString | lower }}
{{ valueIf (dict "key" "holdApplicationUntilProxyStarts" "value" .GetSpec.GetProxy.GetHoldApplicationUntilProxyStarts) }}
{{ toYamlIf (dict "value" .GetSpec.GetProxy.GetResources "key" "resources") }}
{{ toYamlIf (dict "value" .GetSpec.GetProxy.GetLifecycle "key" "lifecycle") }}
{{- if (and .GetSpec.GetProxy .GetSpec.GetProxy.Tracer) }}
{{- if and .GetSpec.GetProxy .GetSpec.GetProxy.Tracer }}
{{- if ne .GetSpec.GetProxy.GetTracer "" }}
{{ valueIf (dict "key" "tracer" "value" .GetSpec.GetProxy.Tracer) }}
{{- end }}
{{- else }}
tracer: zipkin
{{- end }}
{{- end }}

# template for proxy init values
Expand Down
1 change: 1 addition & 0 deletions internal/components/discovery/testdata/icp-expected-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ global:
cpu: 100m
memory: 128Mi
includeIPRanges: "*"
tracer: "zipkin"
proxy_init:
image: proxyv2
resources:
Expand Down
2 changes: 2 additions & 0 deletions internal/components/discovery/testdata/icp-passive-expected-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ global:
clusterName: demo-cluster2
network: network1
caName: Citadel
proxy:
tracer: zipkin
meshConfig:
connectTimeout: 5s
rootNamespace: istio-system
Expand Down
1 change: 1 addition & 0 deletions internal/components/discovery/testdata/icp-test-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ spec:
excludeIPRanges: ""
excludeInboundPorts: ""
excludeOutboundPorts: ""
tracer: "zipkin"
proxyInit:
cni:
enabled: true
Expand Down
Loading