server: add support for CDI device injection. #5571

klihub · 2022-01-25T23:39:58Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds support for injecting CDI devices into containers.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

This PR depends on a pending CDI PR. There is a related go.mod rewrite rule among the commits here, to allow the tree to be compile and tested. Once that CDI PR is merged, the repo diverting rewrite will be removed from this PR.

Does this PR introduce a user-facing change?

Implement CDI device injection: extract the names of requested CDI devices and update
the OCI Spec according to the corresponding CDI device specifications. Please refer to
https://github.com/container-orchestrated-devices/container-device-interface for more
info about CDI.

openshift-ci · 2022-01-25T23:40:07Z

Hi @klihub. Thanks for your PR.

I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

codecov · 2022-01-25T23:46:38Z

Codecov Report

Merging #5571 (a7ec3cc) into main (f4083c4) will increase coverage by 0.01%.
The diff coverage is n/a.

❗ Current head a7ec3cc differs from pull request most recent head 1281651. Consider uploading reports for the commit 1281651 to get more accurate results

@@            Coverage Diff             @@
##             main    #5571      +/-   ##
==========================================
+ Coverage   43.18%   43.19%   +0.01%     
==========================================
  Files         123      123              
  Lines       12267    12265       -2     
==========================================
+ Hits         5297     5298       +1     
+ Misses       6462     6459       -3     
  Partials      508      508

pkg/config/template.go

saschagrunert · 2022-01-27T07:56:18Z

/ok-to-test

saschagrunert

Just a few nits, generally LGTM :)

docs/crio.conf.5.md

server/container_create_linux.go

pkg/config/config.go

docs/crio.conf.5.md

fidencio

LGTM, thanks @klihub!

completions/zsh/_crio

haircommander · 2022-01-31T16:04:45Z

a rebase will fix ci @klihub :)

klihub · 2022-02-24T19:23:28Z

/test integration_crun

klihub · 2022-02-24T19:23:44Z

/test integration_cgroupv2

klihub · 2022-02-24T20:01:18Z

/test integration_cgroupv2

klihub · 2022-02-24T20:57:17Z

/test integration_cgroupv2

klihub · 2022-02-24T20:57:31Z

/test integration_fedora

klihub · 2022-02-24T21:26:24Z

/test integration_cgroupv2

klihub · 2022-02-24T22:06:31Z

/test integration_cgroupv2

klihub · 2022-02-24T23:11:33Z

/test integration_cgroupv2

Signed-off-by: Krisztian Litkey <[email protected]>

Extract the names of requested CDI devices and update the OCI Spec according to the corresponding CDI device specifications. CDI devices are requested using container annotations in the cdi.k8s.io namespace. Once CRI gains dedicated fields for CDI injection the snippet for extracting CDI names will need an update. Signed-off-by: Krisztian Litkey <[email protected]>

Signed-off-by: Krisztian Litkey <[email protected]>

klihub · 2022-02-25T08:02:08Z

/test integration_cgroupv2

klihub · 2022-02-25T10:03:14Z

/test integration_cgroupv2

klihub · 2022-02-25T10:09:04Z

/test integration_cgroupv2

klihub · 2022-02-25T13:21:57Z

/retest-required

klihub · 2022-02-25T13:32:30Z

/retest-required

klihub · 2022-02-25T13:45:32Z

/test integration_cgroupv2

haircommander · 2022-02-25T15:56:30Z

/approve

thanks @klihub!

@cri-o/cri-o-maintainers PTAL

saschagrunert

/lgtm

Great work @klihub!

openshift-ci · 2022-03-07T08:13:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, klihub, saschagrunert

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [haircommander,saschagrunert]

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

openshift-bot · 2022-03-07T10:01:11Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

klihub requested review from mrunalp and runcom as code owners January 25, 2022 23:39

openshift-ci bot requested a review from haircommander January 25, 2022 23:40

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 25, 2022

haircommander reviewed Jan 26, 2022

View reviewed changes

pkg/config/template.go Outdated Show resolved Hide resolved

klihub force-pushed the devel/cdi-support branch from 90e82eb to 3821927 Compare January 26, 2022 23:33

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 27, 2022

saschagrunert approved these changes Jan 27, 2022

View reviewed changes

docs/crio.conf.5.md Outdated Show resolved Hide resolved

server/container_create_linux.go Outdated Show resolved Hide resolved

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2022

elezar reviewed Jan 27, 2022

View reviewed changes

server/container_create_linux.go Outdated Show resolved Hide resolved

server/container_create_linux.go Outdated Show resolved Hide resolved

pkg/config/config.go Show resolved Hide resolved

klihub force-pushed the devel/cdi-support branch 2 times, most recently from 08c6789 to b73ff38 Compare January 27, 2022 15:47

TomSweeneyRedHat reviewed Jan 27, 2022

View reviewed changes

docs/crio.conf.5.md Show resolved Hide resolved

klihub mentioned this pull request Jan 28, 2022

docs: generate manual pages for/from Spec format documentation. cncf-tags/container-device-interface#44

Closed

fidencio reviewed Jan 28, 2022

View reviewed changes

completions/zsh/_crio Outdated Show resolved Hide resolved

klihub force-pushed the devel/cdi-support branch 7 times, most recently from 3e4fd2c to a09fae1 Compare February 1, 2022 00:38

klihub force-pushed the devel/cdi-support branch from facecd3 to 3298336 Compare February 24, 2022 19:28

elezar mentioned this pull request Feb 25, 2022

go.{mod,sum}: relax selinux requirement to v1.9.1. cncf-tags/container-device-interface#50

Merged

klihub added 4 commits February 25, 2022 10:01

go.{mod,sum}: update deps, vendor.

5726161

Signed-off-by: Krisztian Litkey <[email protected]>

config,cli: add configuration for CDI.

a0d3fd8

Signed-off-by: Krisztian Litkey <[email protected]>

test/cdi.bat: add CDI integration tests.

1281651

Signed-off-by: Krisztian Litkey <[email protected]>

klihub force-pushed the devel/cdi-support branch from 3298336 to 1281651 Compare February 25, 2022 08:06

klihub requested a review from saschagrunert March 4, 2022 15:46

saschagrunert approved these changes Mar 7, 2022

View reviewed changes

openshift-ci bot assigned saschagrunert Mar 7, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 7, 2022

openshift-merge-robot merged commit f1d3a46 into cri-o:main Mar 7, 2022

bart0sh mentioned this pull request Mar 9, 2022

CRI: add support for CDI device injection containerd/containerd#6654

Merged

server: add support for CDI device injection. #5571

server: add support for CDI device injection. #5571

Uh oh!

Conversation

klihub commented Jan 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Jan 25, 2022

Uh oh!

codecov bot commented Jan 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

saschagrunert commented Jan 27, 2022

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fidencio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

haircommander commented Jan 31, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 24, 2022

Uh oh!

klihub commented Feb 25, 2022

Uh oh!

klihub commented Feb 25, 2022

Uh oh!

klihub commented Feb 25, 2022

Uh oh!

klihub commented Feb 25, 2022

Uh oh!

klihub commented Feb 25, 2022

Uh oh!

klihub commented Feb 25, 2022

Uh oh!

haircommander commented Feb 25, 2022

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Mar 7, 2022

Uh oh!

openshift-bot commented Mar 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

klihub commented Jan 25, 2022 •

edited

Loading

codecov bot commented Jan 25, 2022 •

edited

Loading