refactor transport socket merge logic #36619
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
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
istio-policy-bot
added
area/networking
release-notes-none
istio-testing
added
the
size/S
hzxuzhonghu
reviewed
Dec 27, 2021
Comment on lines
93
to
97
| // Now check if this matches if existing cluster's transport socket. | ||
| if c.GetTransportSocket() != nil { | ||
| if cpValueCast.GetTransportSocket().Name == c.GetTransportSocket().Name { | ||
| tsmPatch = c.GetTransportSocket() | ||
| } |
There was a problem hiding this comment.
I would suggest, although in theory c.GetTransportSocket() != nil and ·len(c.GetTransportSocketMatches()) > 0 can not be true simultanously
if cpValueCast.GetTransportSocket() != nil {
if len(c.GetTransportSocketMatches()) > 0 {
} else if c.GetTransportSocket() != nil{
}
There was a problem hiding this comment.
Ok. Changed.
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
istio-testing
added
size/M
hzxuzhonghu
reviewed
Dec 28, 2021
| break | ||
| } | ||
| } | ||
| if tsmPatch == nil && len(c.GetTransportSocketMatches()) > 0 { |
There was a problem hiding this comment.
len(c.GetTransportSocketMatches()) > 0 checked in L81
hzxuzhonghu
reviewed
Dec 28, 2021
| // There is a name mismatch, so we cannot do a deep merge. Instead just replace the transport socket | ||
| // This means either there is a name mismatch or cluster does not have transport socket matches/transport socket. | ||
| // We cannot do a deep merge. Instead just replace the transport socket | ||
| if tsmPatch == nil { |
There was a problem hiding this comment.
Isn't this shoube under else if c.GetTransportSocket() != nil
There was a problem hiding this comment.
It really does not matter. But refactored a bit more to simplify further. PTAL.
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
istio-testing
added
size/S
hzxuzhonghu
approved these changes
Dec 31, 2021
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.
No functional change. Just refactors merge transport logic to simplify if conditions and also when the cluster does not have transport socket avoids proto.Merge call.