Fix eds cluster loadassignment with invalid endpoint #50690
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
istio-testing
added
the
size/S
zirain
added
cherrypick/release-1.20
| @@ -335,6 +335,10 @@ func (b *EndpointBuilder) BuildClusterLoadAssignment(endpointIndex *model.Endpoi | |||
| if svcPort.Name != ep.ServicePortName { | |||
| return false | |||
| } | |||
| // filter out endpoint that has invalid ip address, mostly domain name. Because this is generated from ServiceEntry. | |||
There was a problem hiding this comment.
Was this a regression?
There was a problem hiding this comment.
From the issue, it is
There was a problem hiding this comment.
curious which commit?
There was a problem hiding this comment.
TBH i am not sure. It was since 1.18+? @zirain
There was a problem hiding this comment.
I'm sure it's fine in 1.18, and broken since 1.20.
There was a problem hiding this comment.
It would be nice to confirm the regression so we know this is the correct fix
There was a problem hiding this comment.
+1. It would be good identify what commit caused this so that we can know what happened
howardjohn
reviewed
Apr 26, 2024
| // There are other two cases that should not be filtered out: | ||
| // 1. ep.Address can be empty since https://github.com/istio/istio/pull/45150, in this case we will replace it with gateway ip. | ||
| // 2. ep.Address can be uds when EndpointPort = 0 | ||
| if ep.Address != "" && ep.EndpointPort != 0 && net.ParseIP(ep.Address) == nil { |
There was a problem hiding this comment.
nit: we have IsValidIPAddress function already
|
There is cases covering in pilot/pkg/xds/endpoints/ep_filters_test.go And also both for UDS and empty address, which is actually found via CI failiure |
howardjohn
approved these changes
Apr 28, 2024
|
In response to a cherrypick label: #50690 failed to apply on top of branch "release-1.20": |
|
In response to a cherrypick label: new issue created for failed cherrypick: #50717 |
|
In response to a cherrypick label: #50690 failed to apply on top of branch "release-1.21": |
|
In response to a cherrypick label: new issue created for failed cherrypick: #50718 |
This was referenced Apr 28, 2024
|
In response to a cherrypick label: new pull request created: #50719 |
zirain
pushed a commit
to zirain/istio
that referenced
this pull request
Apr 28, 2024
* fix eds cluster has invalid endpoints * Add release note * Fix specical case ep address empty * add uds addr check * use IsValidIP
zirain
pushed a commit
to zirain/istio
that referenced
this pull request
Apr 28, 2024
* fix eds cluster has invalid endpoints * Add release note * Fix specical case ep address empty * add uds addr check * use IsValidIP
zirain
pushed a commit
to zirain/istio
that referenced
this pull request
Apr 28, 2024
* fix eds cluster has invalid endpoints * Add release note * Fix specical case ep address empty * add uds addr check * use IsValidIP
zirain
pushed a commit
to zirain/istio
that referenced
this pull request
Apr 28, 2024
* fix eds cluster has invalid endpoints * Add release note * Fix specical case ep address empty * add uds addr check * use IsValidIP
istio-testing
pushed a commit
that referenced
this pull request
Apr 28, 2024
…50721) * move port name and labels check outside of filterIstioEndpoint (#49629) * move port name and labels check outside of filterIstioEndpoint * fix slices filter * fix ut * Fix eds cluster loadassignment with invalid endpoint (#50690) * fix eds cluster has invalid endpoints * Add release note * Fix specical case ep address empty * add uds addr check * use IsValidIP --------- Co-authored-by: Zhonghu Xu <xuzhonghu@huawei.com>
istio-testing
pushed a commit
that referenced
this pull request
Apr 29, 2024
…50720) * move port name and labels check outside of filterIstioEndpoint (#49629) * move port name and labels check outside of filterIstioEndpoint * fix slices filter * fix ut * Fix eds cluster loadassignment with invalid endpoint (#50690) * fix eds cluster has invalid endpoints * Add release note * Fix specical case ep address empty * add uds addr check * use IsValidIP --------- Co-authored-by: Zhonghu Xu <xuzhonghu@huawei.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please provide a description of this PR:
Fix #50688