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

nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages #85822

Merged
merged 2 commits into from
Apr 23, 2020
Merged

nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages #85822

merged 2 commits into from
Apr 23, 2020
+5 −2

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Apr 22, 2020 •
edited
Loading

Having cni-plugins in systemPackages results in a collision with iproute.

collision between `/nix/store/8v9yf7card7qpv9rlw84xphvnka96afd-iproute2-5.5.0/bin/bridge' and `/nix/store/xqg5p15znrhbsaszin1vbvmyv076h5az-cni-plugins-0.8.5-bin/bin/bridge'

Upstream docs say that a path to the plugins can be passed via config file.

https://github.com/containers/libpod/blob/master/cni/README.md#cni
https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md#crionetwork-table

This is already set for podman by nixos/containers.

cc @adisbladis @saschagrunert @vdemeester

@zowoq zowoq changed the title nixos/{crio,podman}: remove cni-plugins from environment.systemPackages nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages Apr 22, 2020
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 22, 2020
vdemeester
vdemeester approved these changes Apr 23, 2020
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

saschagrunert
saschagrunert approved these changes Apr 23, 2020
View reviewed changes
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.

Yes, LGTM

@adisbladis adisbladis merged commit 0dc3e48 into NixOS:master Apr 23, 2020
@zowoq zowoq deleted the cni-collision branch April 23, 2020 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester

@saschagrunert saschagrunert

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zowoq @vdemeester @saschagrunert @adisbladis