agent: memif and vcl fixes #662
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
hedibouattour
force-pushed
the
memifandvclfixes
branch
2 times, most recently
from
9cc9a5c
to
1a497c8
Compare
hedibouattour
force-pushed
the
memifandvclfixes
branch
from
1a497c8
to
9b4fd78
Compare
sknat
reviewed
Nov 29, 2023
There was a problem hiding this comment.
Thanks for the PR,
As this codepath is getting a bit complex, it might be worth doing a bit of extra refactoring along the way, so that
pblswIfIndex, pblIsL3 := podSpec.GetParamsForIfType(podSpec.PortFilteredIfType)
swIfIndex, isL3 = podSpec.GetParamsForIfType(podSpec.DefaultIfType)
if podSpec.EnableVCL {
err = s.SetupPuntRoutes(podSpec, stack, podSpec.TunTapSwIfIndex)
err = s.AddRouteNetworkVRFToPodVRF(podSpec, stack)
} else if pblswIfIndex != types.InvalidID {
err = s.AddRoutePodVRFtoPodInterface()
err = s.AddRouteNetworkVRFToPodVRF(podSpec, stack)
} else {
err = s.AddRouteNetworkVRFtoPodInterface()
}And remove the logging from the AddVppInterface function to have it only in the AddRoute...To...() functions. What do you think ?
| if err != nil { | ||
| goto err | ||
| } | ||
| } else { | ||
| s.log.Warn("No default if type for pod") | ||
| } | ||
| if pblswIfIndex != types.InvalidID { | ||
| err = s.CreateVRFRoutesToPod(podSpec, stack) |
There was a problem hiding this comment.
Maybe CreateVRFRoutesToPod -> AddRouteNetworkVRFToPodVRF
| swIfIndex, isL3 = podSpec.GetParamsForIfType(podSpec.DefaultIfType) | ||
| if swIfIndex != types.InvalidID { | ||
| s.log.Infof("pod(add) Default routes to swIfIndex=%d isL3=%t", swIfIndex, isL3) | ||
| err = s.RoutePodInterface(podSpec, stack, swIfIndex, isL3) | ||
| err = s.RoutePodInterface(podSpec, stack, swIfIndex, isL3, pblswIfIndex != types.InvalidID) |
There was a problem hiding this comment.
Instead of a inPodVRF it might be better to have two functions :
AddRouteNetworkVRFtoPodInterface()AddRoutePodVRFtoPodInterface()
| @@ -210,16 +210,23 @@ func (s *Server) AddVppInterface(podSpec *storage.LocalPodSpec, doHostSideConf b | |||
| goto err | |||
| } | |||
| } else { | |||
| pblswIfIndex, _ := podSpec.GetParamsForIfType(podSpec.PortFilteredIfType) | |||
There was a problem hiding this comment.
If might be worth adding a
pblswIfIndex, pblIsL3 := podSpec.GetParamsForIfType(podSpec.PortFilteredIfType)
swIfIndex, isL3 = podSpec.GetParamsForIfType(podSpec.DefaultIfType)
at the beginning of the /* Routes */ section
|
Actually with the release proximity and as this fixes memif/VCL, let's maybe merge this PR and keep the refactoring for a later PR. |
sknat
approved these changes
Dec 7, 2023
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 description provided.