Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 98b3ac8d40c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0dc3e485a11d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 23, 2020

  1. nixos/cri-o: remove cni-plugins from environment.systemPackages

    @zowoq
    zowoq committed Apr 23, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 04D0CEAF916A9A40
    Learn about vigilant mode
    Copy the full SHA
    54b59dd View commit details

  2. nixos/podman: remove cni-plugins from environment.systemPackages

    @zowoq
    zowoq committed Apr 23, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 04D0CEAF916A9A40
    Learn about vigilant mode
    Copy the full SHA
    4102db2 View commit details

  3. Merge pull request #85822 from zowoq/cni-collision 

    nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages
    @adisbladis
    adisbladis authored Apr 23, 2020
    Copy the full SHA
    0dc3e48 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −1 nixos/modules/virtualisation/cri-o.nix
  2. +0 −1 nixos/modules/virtualisation/podman.nix
6 changes: 5 additions & 1 deletion nixos/modules/virtualisation/cri-o.nix
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ in

config = mkIf cfg.enable {
environment.systemPackages = with pkgs;
[ cri-o cri-tools conmon cni-plugins iptables runc utillinux ];
[ cri-o cri-tools conmon iptables runc utillinux ];
environment.etc."crictl.yaml".text = ''
runtime-endpoint: unix:///var/run/crio/crio.sock
'';
@@ -57,6 +57,10 @@ in
${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries}
]
[crio.network]
plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
network_dir = "/etc/cni/net.d/"
[crio.runtime]
conmon = "${pkgs.conmon}/bin/conmon"
log_level = "${cfg.logLevel}"
1 change: 0 additions & 1 deletion nixos/modules/virtualisation/podman.nix
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,6 @@ in
pkgs.slirp4netns # User-mode networking for unprivileged namespaces
pkgs.fuse-overlayfs # CoW for images, much faster than default vfs
pkgs.utillinux # nsenter
pkgs.cni-plugins # Networking plugins
pkgs.iptables
]
++ lib.optional cfg.dockerCompat dockerCompat;