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

Propagate existing CNI_ARGS to non-k8s consumers, e.g., podman #70

Merged
merged 2 commits into from
Mar 3, 2021

Conversation

space88man
Copy link
Contributor

@space88man space88man commented Feb 20, 2020

Let's try again. Add existing CNI_ARGS in the environment to rt.Args in case the caller is a non-k8s consumer like podman.

Addresses #65

@openshift-ci-robot openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 20, 2020
@space88man
Copy link
Contributor Author

/assign @sameo

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

@rhatdan
Copy link
Contributor

rhatdan commented Feb 21, 2020

@mheon @mrunalp PTAL

pkg/ocicni/ocicni.go Outdated Show resolved Hide resolved
@space88man
Copy link
Contributor Author

Bump - thank you.

@dcbw
Copy link
Collaborator

dcbw commented Apr 20, 2020

@squeed can you weigh in?

@squeed
Copy link
Collaborator

squeed commented Apr 20, 2020

Hmm. We solved this a quite different way in rkt - you could do something like --net=myptp,FOO=BAR --net=myvlan,BAZ=BAR.

It would be good if podman itself decided what CNI_ARGS should be and passed them directly to oci-cni instead. If it wants to gather them from the environment, that's OK but not optimal (since it might have multiple networks). ocicni should probably not be adding additional args.

@rhatdan
Copy link
Contributor

rhatdan commented Jun 9, 2020

@mheon @mccv1r0 WDYT?

@space88man
Copy link
Contributor Author

"ocicni should probably not be adding additional args." — in this use case, it is trying to propagate the existing env, since that got overwritten by the K8S* stuff.

@rhatdan
Copy link
Contributor

rhatdan commented Dec 3, 2020

@space88man @haircommander @mrunalp @dcbw @squeed @saschagrunert Is this still needed? Just trying to cleanup this Repo so we can do a release.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 1, 2021

@space88man @haircommander @mrunalp @dcbw @squeed @saschagrunert Is this still needed? Just trying to cleanup this Repo so we can do a release.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 2, 2021

@mheon @baude PTAL Do we need this?

@mheon
Copy link
Contributor

mheon commented Mar 2, 2021

It's not essential but it's definitely nice to have.

@rhatdan rhatdan added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2021
@mheon
Copy link
Contributor

mheon commented Mar 2, 2021

@mccv1r0 Can you take a quick look at this and verify the way the args are being passed looks correct?

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: mccv1r0, saschagrunert, space88man

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

@space88man
Copy link
Contributor Author

@space88man @haircommander @mrunalp @dcbw @squeed @saschagrunert Is this still needed? Just trying to cleanup this Repo so we can do a release.
Yes - I would like this to go in for pet pods.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 3, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2021
@openshift-merge-robot openshift-merge-robot merged commit 87390b5 into cri-o:master Mar 3, 2021
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants