This repository has been archived by the owner on May 12, 2021. It is now read-only.
network: Detect and add static ARP entries #2672
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
amshinde
added
area/api
|
This needs to be merged after the agent PR is merged and vendored here. |
jodh-intel
reviewed
May 11, 2020
virtcontainers/kata_agent.go
Outdated
| if grpcStatus.Convert(err).Code() == codes.Unimplemented { | ||
| k.Logger().WithFields(logrus.Fields{ | ||
| "arpneighbors-requested": fmt.Sprintf("%+v", neighs), | ||
| }).Warn("add ARP neighbors request failed due to old agent, please upgrade agent") |
There was a problem hiding this comment.
I think it might be clearer if we change this message slightly since it assumes knowledge of Kata internals. Maybe something like:
.Warn("add ARP neighbors request failed due to old agent (please upgrade Kata Containers image version)")
virtcontainers/kata_agent.go
Outdated
| } | ||
| k.Logger().WithFields(logrus.Fields{ | ||
| "arpneighbors-requested": fmt.Sprintf("%+v", neighs), | ||
| }).WithError(err).Error("add ARP neighbors request failed:") |
There was a problem hiding this comment.
Nit: Trailing colon in error message.
| @@ -11,6 +11,7 @@ | |||
| IPAddress | |||
| Interface | |||
| Route | |||
| ARPNeighbor | |||
There was a problem hiding this comment.
Missing commit to update Gopkg.toml?
There was a problem hiding this comment.
I have vendored in the agent changes. This is fixed now.
amshinde
force-pushed
the
add-arp-neighbors
branch
from
34bff7b to
8fb7b1b
Compare
changes: 42438f network: Add grpc method to add static arp neighbors Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
amshinde
force-pushed
the
add-arp-neighbors
branch
from
8fb7b1b to
ea7c276
Compare
Some network plugins add static arp entries in the network namespace. Scan namespace for static entries and pass these on to the agent to be added within the guest. If the grpc api is not implemented by the agent due to a older running agent, check for this and do not error out to maintain backward compatibility. Fixes kata-containers#2671 Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
amshinde
force-pushed
the
add-arp-neighbors
branch
from
ea7c276 to
67d3e2c
Compare
|
/test |
|
This is ready for review. I have vendored in agent changes. |
Codecov Report
@@ Coverage Diff @@
## master #2672 +/- ##
==========================================
+ Coverage 45.83% 50.41% +4.58%
==========================================
Files 118 118
Lines 17526 17205 -321
==========================================
+ Hits 8033 8674 +641
+ Misses 8605 7467 -1138
- Partials 888 1064 +176 |
|
ARM CI is failing - I suspect something on the build node rather than this PR. /cc @Pennyzct |
|
Hi @grahamwhaley |
jodh-intel
approved these changes
May 21, 2020
|
cc @mcastelino |
devimc
approved these changes
May 27, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Some network plugins add static arp entries in the network namespace.
Scan namespace for static entries and pass these on to the
agent to be added within the guest.
Fixes #2671
Signed-off-by: Archana Shinde archana.m.shinde@intel.com