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.

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

OSSM-5444: Fix mapping spec.tracing.type: None to helm values #1558

Merged
merged 3 commits into from
Dec 22, 2023

Conversation

jewertow
Copy link
Member

When I was testing zipkin extension provider, I noticed that we incorrectly handle None tracing type and as a result istio proxies receive incorrect default config:

defaultConfig:
  discoveryAddress: istiod-basic.istio-system.svc:15012
  proxyMetadata:
    ISTIO_META_DNS_AUTO_ALLOCATE: "true"
    ISTIO_META_DNS_CAPTURE: "true"
    PROXY_XDS_VIA_AGENT: "true"
  tracing: null

and therefore pilot-agent overwrites tracing: null with the default zipkin address, while the expected config is:

defaultConfig:
  discoveryAddress: istiod-basic.istio-system.svc:15012
  proxyMetadata:
    ISTIO_META_DNS_AUTO_ALLOCATE: "true"
    ISTIO_META_DNS_CAPTURE: "true"
    PROXY_XDS_VIA_AGENT: "true"
  tracing: {}

Actually, it does not affect tracing, because when a Telemetry config is applied to a proxy, the default tracing address is not used by Envoy, but it might be confusing when debugging tracing issues.

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
@jewertow jewertow requested a review from yxun December 22, 2023 17:57
@openshift-ci openshift-ci bot added the size/M label Dec 22, 2023
Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
# caCertificates: # example: /etc/istio/tracer/root-cert.pem
# sni: # example: tracer.somedomain
# subjectAltNames: []
# - tracer.somedomain
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel it's better comment out the line 405 and keep the comment lines 406-413 for tlsSettings example references

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed these values, because they are obsolete and no longer used in the charts.

@openshift-merge-bot openshift-merge-bot bot merged commit 242cff4 into maistra:maistra-2.5 Dec 22, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants