Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check version incompatibility (#762) #798

Merged

Conversation

s1061123
Copy link
Member

Just a cherry-pikck #762 to 4.0 branch

* multus: entrypoint: disallow incompatible cni versions

When top level CNI version is 0.4.0 or more, nested CNI version
can't be less than 0.4.0 since these are incompatible. This
closes issue k8snetworkplumbingwg#737.

Signed-off-by: Balazs Nemeth <[email protected]>

* multus: thick: disallow incompatible cni versions

Similarly to disallowing incompatible versions in entrypoint.sh,
add the same logic in go for the thick plugin.

Signed-off-by: Balazs Nemeth <[email protected]>

* multus: add unit test for incompatible cni versions

Signed-off-by: Balazs Nemeth <[email protected]>
@coveralls
Copy link

Pull Request Test Coverage Report for Build 1910331057

  • 29 of 38 (76.32%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.01%) to 66.97%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/config/manager.go 4 5 80.0%
pkg/config/generator.go 25 33 75.76%
Totals Coverage Status
Change from base Build 1882473609: 0.01%
Covered Lines: 1768
Relevant Lines: 2640

💛 - Coveralls

@s1061123 s1061123 merged commit efde67b into k8snetworkplumbingwg:feature/multus-4.0 Feb 28, 2022
@s1061123 s1061123 deleted the cherry-pick/762 branch February 28, 2022 13:04
s1061123 added a commit that referenced this pull request Apr 5, 2022
* multus: entrypoint: disallow incompatible cni versions

When top level CNI version is 0.4.0 or more, nested CNI version
can't be less than 0.4.0 since these are incompatible. This
closes issue #737.

Signed-off-by: Balazs Nemeth <[email protected]>

* multus: thick: disallow incompatible cni versions

Similarly to disallowing incompatible versions in entrypoint.sh,
add the same logic in go for the thick plugin.

Signed-off-by: Balazs Nemeth <[email protected]>

* multus: add unit test for incompatible cni versions

Signed-off-by: Balazs Nemeth <[email protected]>

Co-authored-by: Balazs Nemeth <[email protected]>
cruizen pushed a commit to platform9/multus-cni that referenced this pull request Apr 11, 2024
…lumbingwg#798)

* multus: entrypoint: disallow incompatible cni versions

When top level CNI version is 0.4.0 or more, nested CNI version
can't be less than 0.4.0 since these are incompatible. This
closes issue k8snetworkplumbingwg#737.

Signed-off-by: Balazs Nemeth <[email protected]>

* multus: thick: disallow incompatible cni versions

Similarly to disallowing incompatible versions in entrypoint.sh,
add the same logic in go for the thick plugin.

Signed-off-by: Balazs Nemeth <[email protected]>

* multus: add unit test for incompatible cni versions

Signed-off-by: Balazs Nemeth <[email protected]>

Co-authored-by: Balazs Nemeth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants