Return correct CNI version string #106
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
cmd/tc-redirect-tap/main_test.go
Outdated
| @@ -216,7 +216,7 @@ func TestGetCurrentResult(t *testing.T) { | |||
| StdinData: rawPrevResultBytes, | |||
| } | |||
|
|
|||
| actualResult, err := getCurrentResult(cmdArgs) | |||
| actualResult, _, err := getCurrentResult(cmdArgs) | |||
There was a problem hiding this comment.
We can validate here the the returned result matches the cni version in the conf.
Prior to this commit, we were using the output of a result to return a CNI version. This would always be the latest supported version returned by the CNI library. This meant that, regardless of the CNI version used in a user's conflist, it would always report back that the latest version was being used, which is both incorrect behavior and breaks workflows where the latest version was not recognized as a valid version. This change fixes this behavior and returns the same CNI version specified in the conflist, which mirrors the behavior of other CNI plugins. Signed-off-by: David Son <[email protected]>
sondavidb
force-pushed
the
report-correct-version
branch
from
1827bc2 to
5f807a8
Compare
swagatbora90
approved these changes
Jan 10, 2025
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.
Issue #, if available:
Related to #98
Description of changes:
Prior to this commit, we were using the output of a result to return a CNI version. This would always be the latest supported version returned by the CNI library. This meant that, regardless of the CNI version used in a user's conflist, it would always report back that the latest version was being used, which is both incorrect behavior and breaks workflows where the latest version was not recognized as a valid version.
This change fixes this behavior and returns the same CNI version specified in the conflist, which mirrors the behavior of other CNI plugins (e.g. ptp, bridge)
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.