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

add cgroupPath capability arg #141

Merged
merged 1 commit into from
Feb 27, 2023

Conversation

squeed
Copy link
Collaborator

@squeed squeed commented Feb 15, 2023

Add in the plumbing for the cgroupPath capability.

Ref: containernetworking/cni#936

There is a similar PR implementing support in go-cni: containerd/go-cni#110

Add in the plumbing for the cgroupPath capability.

Signed-off-by: Casey Callendrello <c1@caseyc.net>
@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 Feb 15, 2023
@squeed squeed added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 15, 2023
@coveralls
Copy link

Pull Request Test Coverage Report for Build 4186148033

  • 3 of 3 (100.0%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.1%) to 66.387%

Totals Coverage Status
Change from base Build 4051956152: 0.1%
Covered Lines: 474
Relevant Lines: 714

💛 - Coveralls

@openshift-ci openshift-ci bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Feb 15, 2023
@squeed
Copy link
Collaborator Author

squeed commented Feb 15, 2023

fyi @aditighag


// set cgroupPath in Capabilities
if runtimeConfig.CgroupPath != "" {
rt.CapabilityArgs["cgroupPath"] = runtimeConfig.CgroupPath
Copy link
Member

Choose a reason for hiding this comment

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

does this string exist anywhere we can reference directly?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

not that I see; I just followed the existing code that puts capability names here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good suggestion for libcni sometime though.

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 other than @haircommander comment

@haircommander
Copy link
Member

/lgtm

thanks @squeed !

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 27, 2023
@openshift-merge-robot openshift-merge-robot merged commit 183c461 into cri-o:master Feb 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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-none Denotes a PR that doesn't merit a release note.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants