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 InitCNIWithCache to set the cni cache directory #84

Merged
merged 1 commit into from
Mar 1, 2021

Conversation

Luap99
Copy link
Contributor

@Luap99 Luap99 commented Feb 18, 2021

Add a new function InitCNIWithCache which works like
InitCNI except that it accepts an extra parameter to
set the cache directory.

This change is needed for rootless users which are
trying to use cni in a user+net namespace because the
default directory is not writeable by rootless users.

Second, setting the cni cache directory via the runtime
config is deprecated. It has to be set with
NewCNIConfigWithCacheDir for the cni config.
see: containernetworking/cni#682

Add new InitCNIWithCache function to allow changing the cni cache directory

Add a new function InitCNIWithCache which works like
InitCNI except that it accepts an extra parameter to
set the cache directory.

This change is needed for rootless users which are
trying to use cni in a user+net namespace because the
default directory is not writeable by rootless users.

Second, setting the cni cache directory via the runtime
config is deprecated. It has to be set with
NewCNIConfigWithCacheDir for the cni config.
see: containernetworking/cni#682

Signed-off-by: Paul Holzinger <[email protected]>
@openshift-ci-robot openshift-ci-robot 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 18, 2021
@Luap99
Copy link
Contributor Author

Luap99 commented Feb 18, 2021

This is needed for containers/podman#9423

@Luap99
Copy link
Contributor Author

Luap99 commented Feb 20, 2021

@rhatdan @baude @mheon @vrothberg PTAL

Copy link
Member

@vrothberg vrothberg 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-robot openshift-ci-robot 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 Feb 22, 2021
@rhatdan
Copy link
Contributor

rhatdan commented Mar 1, 2021

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 1, 2021
@rhatdan rhatdan added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 1, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: Luap99, rhatdan

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 541cf7c into cri-o:master Mar 1, 2021
@Luap99 Luap99 deleted the cache branch March 1, 2021 20:59
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 Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants