Use correct output format for CNI Add in networkPolicyOnly mode #2037
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
As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes antrea-io#2002
Codecov Report
@@ Coverage Diff @@
## main #2037 +/- ##
===========================================
+ Coverage 41.69% 61.59% +19.90%
===========================================
Files 127 265 +138
Lines 15844 19770 +3926
===========================================
+ Hits 6606 12178 +5572
+ Misses 8684 6331 -2353
- Partials 554 1261 +707
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
Thanks Quan. I will run the cloud tests and also validate the fix manually for containerd with AKS. |
|
/test-all |
|
I've verified this patch with our 3 cloud CI jobs (AKS / GKE / EKS) With the patch: NodeInfo: |
antoninbas
deleted the
correct-cni-response-format-for-cni-add-in-networkPolicyOnly-mode
branch
antoninbas
added a commit
to antoninbas/antrea
that referenced
this pull request
Apr 30, 2021
…ea-io#2037) As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes antrea-io#2002
antoninbas
added a commit
to antoninbas/antrea
that referenced
this pull request
Apr 30, 2021
…ea-io#2037) As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes antrea-io#2002
antoninbas
added a commit
that referenced
this pull request
Apr 30, 2021
As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes #2002
antoninbas
added a commit
to antoninbas/antrea
that referenced
this pull request
Apr 30, 2021
…ea-io#2037) As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes antrea-io#2002
antoninbas
added a commit
that referenced
this pull request
May 1, 2021
As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes #2002
antoninbas
added a commit
to antoninbas/antrea
that referenced
this pull request
May 1, 2021
…ea-io#2037) As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes antrea-io#2002
antoninbas
added a commit
that referenced
this pull request
May 3, 2021
As per the CNI specification for the Add command: > If the plugin was supplied a prevResult as part of its input configuration, it MUST handle prevResult by either passing it through, or modifying it appropriately. In networkPolicyOnly mode, CNI chaining is used. Antrea receives a prevResult from the container runtime and must output it in case of success. We do not make any changes to the result, but we may convert it to a different CNI version format (the default one for Antrea). Previously, Antrea would output the entire input configuration (which does include prevResult), which would cause containerd to return an error. The integration test was incorrect and had to be fixed. Fixes #2002
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.
As per the CNI specification for the Add command:
In networkPolicyOnly mode, CNI chaining is used. Antrea receives a
prevResult from the container runtime and must output it in case of
success. We do not make any changes to the result, but we may convert it
to a different CNI version format (the default one for Antrea).
Previously, Antrea would output the entire input configuration (which
does include prevResult), which would cause containerd to return an
error.
The integration test was incorrect and had to be fixed.
Fixes #2002