Skip to content

ocicni: watch bindirs too #107

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 2, 2022
Merged

ocicni: watch bindirs too #107

merged 1 commit into from
Jun 2, 2022

Conversation

dcbw
Copy link
Collaborator

@dcbw dcbw commented Jun 1, 2022 •
edited
Loading

Config validation involves finding and execing the config's plugin
to determine the CNI spec versions the plugin binary supports.

If the config is written to disk before or concurrently with the
plugin binary then the validation may race with the binary and
fail to either find it or exec it.

Watch bindirs for changes and resync network config when plugin
binaries change.

If `true` is passed to InitCNI() to watch directories, ocicni now watches the passed CNI plugin binary directories too. This ensures that if plugin binaries are written at the same time as or after the CNI configuration that uses them, the network will be correctly detected by ocicni.

@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 1, 2022
@openshift-ci openshift-ci bot requested review from rajatchopra and sameo June 1, 2022 13:39
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2022
@coveralls
Copy link

coveralls commented Jun 1, 2022 •
edited
Loading

Pull Request Test Coverage Report for Build 2428422708

  • 11 of 15 (73.33%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.4%) to 66.245%
Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/ocicni/ocicni.go 11 15 73.33%
Totals Coverage Status
Change from base Build 2270958331: 0.4%
Covered Lines: 471
Relevant Lines: 711
💛 - Coveralls

@dcbw dcbw force-pushed the watch-bindirs branch from bfca813 to d4dd779 Compare June 1, 2022 15:08
@haircommander
Copy link
Member

LGTM

saschagrunert
saschagrunert reviewed Jun 2, 2022
View reviewed changes
@dcbw
ocicni: watch bindirs too
812b7bb 
Config validation involves finding and execing the config's plugin
to determine the CNI spec versions the plugin binary supports.

If the config is written to disk before or concurrently with the
plugin binary then the validation may race with the binary and
fail to either find it or exec it.

Watch bindirs for changes and resync network config when plugin
binaries change.

Signed-off-by: Dan Williams <[email protected]>
@dcbw dcbw force-pushed the watch-bindirs branch from d4dd779 to 812b7bb Compare June 2, 2022 13:09
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 2, 2022
@dcbw
Copy link
Collaborator Author

dcbw commented Jun 2, 2022

@saschagrunert PTAL thanks!

saschagrunert
saschagrunert approved these changes Jun 2, 2022
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 4919995 into cri-o:master Jun 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@rajatchopra rajatchopra Awaiting requested review from rajatchopra

@sameo sameo Awaiting requested review from sameo

Assignees

@saschagrunert saschagrunert

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dcbw @coveralls @haircommander @saschagrunert @openshift-merge-robot