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.

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

[master] Add option to change CNI network default #2123

Closed
wants to merge 1 commit into from
Closed

[master] Add option to change CNI network default #2123

wants to merge 1 commit into from

Conversation

haircommander
Copy link
Member

- What I did
Began work on changing the network configurations from using every config file in the config dir to only ones specified.
- How I did it
Vendored in changes to ocicni and cni to allow for adding default network config to InitCNI
- Description for the changelog

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 11, 2019
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 11, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @haircommander. Thanks for your PR.

I'm waiting for a kubernetes-sigs or kubernetes 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.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 11, 2019
@haircommander
Copy link
Member Author

Adding WIP tag because: this patch currently doesn't actually work. Further, there should be some discussion on the default config name. Lastly, the documentation has to be added if this change is breaking. I just put it here to run against CI to see if any of my changes thus far break anything.

@haircommander
Copy link
Member Author

This PR will also:
fix #2121
unblock #2041

@haircommander haircommander force-pushed the cni_network_default branch 4 times, most recently from 3cac136 to a31c67c Compare March 15, 2019 18:10
@haircommander
Copy link
Member Author

/test e2e_features_rhel

@haircommander haircommander changed the title WIP Add option to change CNI network default Add option to change CNI network default Mar 15, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 15, 2019
@haircommander
Copy link
Member Author

/test kata-containers

@haircommander
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

@haircommander: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

@haircommander
Copy link
Member Author

/ok-to-test

@openshift-ci-robot openshift-ci-robot 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 Mar 15, 2019
@haircommander haircommander changed the title Add option to change CNI network default [master] Add option to change CNI network default Mar 18, 2019
@haircommander
Copy link
Member Author

haircommander commented Mar 18, 2019 •
edited

PTAL @rhatdan @umohnani8 @mrunalp @sboeuf @vrothberg

@rhatdan
Copy link
Contributor

rhatdan commented Mar 18, 2019

/approve
LGTM

@openshift-ci-robot openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Apr 16, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, rhatdan, sboeuf

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

1 similar comment
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, rhatdan, sboeuf

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

@haircommander
Copy link
Member Author

/retest

@haircommander haircommander force-pushed the cni_network_default branch 4 times, most recently from 36c8fbe to a501214 Compare April 24, 2019 16:09
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 26, 2019
@haircommander
Filter CNI config by name.
61eba8a 
Before, CRI-O would get confused when there were other CNI configuration files
in the same plugin_dir. Fix this by updating CNI and ocicni to latest version,
which allow for tools to ignore config files with different names.

Now, users can run CRI-O and change the cni_default_network name, which allows them
to have multiple tools to occupy the same directory. The default value for this is crio.

Update documentation to reflect this change.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@openshift-ci-robot openshift-ci-robot removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 9, 2019
@haircommander
Copy link
Member Author

/retest

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 15, 2019
@openshift-ci-robot
Copy link

@haircommander: PR needs rebase.

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.

@rhatdan
Copy link
Contributor

rhatdan commented Jul 21, 2019

@haircommander Is this still something you are working on?

@haircommander
Copy link
Member Author

@rhatdan it was backlogged but I'd like to continue working on it.

@saschagrunert
Copy link
Member

@haircommander this needs a rebase :)

@openshift-ci-robot
Copy link

@haircommander: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/e2e_crun 61eba8a link /test e2e_crun
ci/openshift-jenkins/integration_crun 61eba8a link /test integration_crun

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 7, 2020

@haircommander Needs a rebase.

@haircommander
Copy link
Member Author

on my todo, which has gotten much longer with all of these pings 😄

@rhatdan
Copy link
Contributor

rhatdan commented Mar 22, 2020

@giuseppe Do you have a chance to take this one over?

@saschagrunert
Copy link
Member

If @giuseppe has no time I'm keen to take this one as well.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 23, 2020

@saschagrunert Take it. I am sure @giuseppe Has plenty of other things to do? I always have pet projects for him. :^) (User namespace...)

@saschagrunert saschagrunert mentioned this pull request Mar 23, 2020
Merged
@haircommander
Copy link
Member Author

closing in favor of #3452

@haircommander haircommander deleted the cni_network_default branch September 27, 2021 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp left review comments

@umohnani8 umohnani8 umohnani8 left review comments

@sboeuf sboeuf sboeuf approved these changes

@runcom runcom Awaiting requested review from runcom

@rhatdan rhatdan Awaiting requested review from rhatdan

Assignees
No one assigned
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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@haircommander @k8s-ci-robot @rhatdan @umohnani8 @codecov-io @mrunalp @openshift-ci-robot @saschagrunert @sboeuf @cblecker