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

Install cni conf after installing cni bins #3154

Merged
merged 1 commit into from Jan 29, 2022

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented Dec 20, 2021

Otherwise container runtimes such as cri-o would fail to validate the
cni conf if it doesn't find the bins when it resyncs network conf,
triggered by the conf file update event.

Signed-off-by: Quan Tian qtian@vmware.com

Fixes #2531

Otherwise container runtimes such as cri-o would fail to validate the
cni conf if it doesn't find the bins when it resyncs network conf,
triggered by the conf file update event.

Signed-off-by: Quan Tian <qtian@vmware.com>
@codecov-commenter
Copy link

codecov-commenter commented Dec 20, 2021

Codecov Report

Merging #3154 (536d08c) into main (ebeb2d4) will decrease coverage by 8.72%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3154      +/-   ##
==========================================
- Coverage   60.74%   52.01%   -8.73%     
==========================================
  Files         295      471     +176     
  Lines       24907    55703   +30796     
==========================================
+ Hits        15130    28975   +13845     
- Misses       8118    24296   +16178     
- Partials     1659     2432     +773     
Flag Coverage Δ
e2e-tests 52.05% <ø> (?)
integration-tests 31.38% <ø> (?)
kind-e2e-tests 47.74% <ø> (+0.12%) ⬆️
unit-tests 40.35% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/agent/cniserver/ipam/antrea_ipam_controller.go 12.97% <0.00%> (-52.41%) ⬇️
pkg/ipam/poolallocator/allocator.go 21.28% <0.00%> (-41.14%) ⬇️
pkg/agent/cniserver/pod_configuration_linux.go 26.31% <0.00%> (-40.36%) ⬇️
pkg/agent/cniserver/ipam/antrea_ipam.go 42.16% <0.00%> (-34.31%) ⬇️
pkg/controller/networkpolicy/endpoint_querier.go 61.46% <0.00%> (-29.97%) ⬇️
pkg/controller/egress/controller.go 61.11% <0.00%> (-27.34%) ⬇️
.../registry/networkpolicy/clustergroupmember/rest.go 64.28% <0.00%> (-23.95%) ⬇️
pkg/agent/util/ethtool/ethtool_linux.go 46.66% <0.00%> (-23.34%) ⬇️
pkg/controller/ipam/validate.go 57.14% <0.00%> (-22.86%) ⬇️
pkg/agent/util/iptables/lock.go 60.00% <0.00%> (-21.82%) ⬇️
... and 455 more

Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tnqn tnqn added the action/release-note Indicates a PR that should be included in release notes. label Jan 29, 2022
@tnqn
Copy link
Member Author

tnqn commented Jan 29, 2022

/test-all

@tnqn tnqn added this to the Antrea v1.6 release milestone Jan 29, 2022
@tnqn
Copy link
Member Author

tnqn commented Jan 29, 2022

/test-integration

@tnqn tnqn merged commit c4713ec into antrea-io:main Jan 29, 2022
@tnqn tnqn deleted the cni-install-order branch January 29, 2022 12:07
yanjunz97 pushed a commit to yanjunz97/antrea that referenced this pull request Feb 14, 2022
Otherwise container runtimes such as cri-o would fail to validate the
cni conf if it doesn't find the bins when it resyncs network conf,
triggered by the conf file update event.

Signed-off-by: Quan Tian <qtian@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/release-note Indicates a PR that should be included in release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cri-o backend no cni netconfig
3 participants