Skip to content

[1.15] Fix PushContext.sidecarIndex.rootConfig flipping issue (#40575)#41255

Merged
istio-testing merged 1 commit intoistio:release-1.15from
howardjohn:15/fix-root-config
Oct 7, 2022
Merged

[1.15] Fix PushContext.sidecarIndex.rootConfig flipping issue (#40575)#41255
istio-testing merged 1 commit intoistio:release-1.15from
howardjohn:15/fix-root-config

Conversation

@howardjohn
Copy link
Copy Markdown
Member

@howardjohn howardjohn commented Oct 3, 2022

When a PushRequest doesn't have Service/VirtualService/DestinationRule/Sidecar change, in PushContext.updateContext(), initSidecarScopes() will not be invoked, new PushContext only copies sidecarIndex.sidecarsByNamespace from old one, sidecarIndex.rootConfig becomes nil.

When workload namespace doesn't have Sidecar resource, this causes new ADS connection's SidecarScope being created by DefaultSidecarScopeForNamespace(), the global default sidecar in istio root namespace is not respected.

(cherry picked from commit 5da33de) (cherry picked from commit 348b5e9a442f580361e319265e012729807809f7)

Please provide a description of this PR:

When a PushRequest doesn't have Service/VirtualService/DestinationRule/Sidecar change,
in PushContext.updateContext(), initSidecarScopes() will not be invoked, new PushContext
only copies sidecarIndex.sidecarsByNamespace from old one, sidecarIndex.rootConfig becomes
nil.

When workload namespace doesn't have Sidecar resource, this causes new ADS connection's
SidecarScope being created by DefaultSidecarScopeForNamespace(), the global default
sidecar in istio root namespace is not respected.

(cherry picked from commit 5da33de)
(cherry picked from commit 348b5e9a442f580361e319265e012729807809f7)
@howardjohn howardjohn requested a review from a team October 3, 2022 18:41
@howardjohn howardjohn changed the title Fix PushContext.sidecarIndex.rootConfig flipping issue (#40575) [1.15] Fix PushContext.sidecarIndex.rootConfig flipping issue (#40575) Oct 3, 2022
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 3, 2022
@dhawton
Copy link
Copy Markdown
Member

dhawton commented Oct 4, 2022

/test unit-tests-arm64

@howardjohn
Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@howardjohn
Copy link
Copy Markdown
Member Author

/retest

@istio-testing istio-testing merged commit 4d5007b into istio:release-1.15 Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants