From 4d42e5c89d362c17b0b52061863b06cdc2dc22fd Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 29 Dec 2024 18:10:45 -0700
Subject: [PATCH] [NixOS] Use /opt/cni/bin as dir for network plugins

---
 nixos/k3s.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/k3s.nix b/nixos/k3s.nix
index 497a782d..0b88c9a5 100644
--- a/nixos/k3s.nix
+++ b/nixos/k3s.nix
@@ -11,7 +11,9 @@ with lib; let
   plugins-path = pkgs.buildEnv {
     name = "combined-cni-plugins";
     paths = [
-      pkgs.cni-plugins pkgs.calico-cni-plugin
+      pkgs.cni-plugins
+      pkgs.calico-cni-plugin
+      pkgs.calico-kube-controllers
     ];
   };
 in {
@@ -51,7 +53,7 @@ in {
         plugins."io.containerd.grpc.v1.cri" = {
           enable_cdi = true;
           cdi_spec_dirs = [ "/var/run/cdi" ];
-          cni.bin_dir = "${plugins-path}/bin";
+          cni.bin_dir = "/opt/cni/bin";
         };
       };
     };