diff options
| author | Charles Strahan <charles@cstrahan.com> | 2018-03-17 01:35:35 -0400 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2018-03-30 17:33:45 -0400 |
| commit | 709b6f664e472ae2075bbee83bfb1dd1ba95e0e7 (patch) | |
| tree | 9734a502a41317637cb25a8986c47c1e8d7a7224 /nixos/modules/services/cluster/kubernetes | |
| parent | 5de6ee22d1286b8b87b8dae56a1310f4b43af81e (diff) | |
| download | nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.gz nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.bz2 nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.lz nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.xz nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.zst nixlib-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.zip | |
nixos: kubernetes fixes
* Fix reference CNI plugins
* The plugins were split out of the upstream cni repo around version
0.6.0
* Fix RBAC and DNS tests
* Fix broken apiVersion fields
* Change plugin linking to look in ${package}/bin rather than
${package.plugins}
* Initial work towards a working e2e test
* Test still fails, but at least the expression evaluates now
Continues @srhb's work in #37199
Fixes #37199
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 39c5d78d4191..aeb0a0d2432d 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -766,7 +766,7 @@ in { rm /opt/cni/bin/* || true ${concatMapStrings (package: '' echo "Linking cni package: ${package}" - ln -fs ${package.plugins}/* /opt/cni/bin + ln -fs ${package}/bin/* /opt/cni/bin '') cfg.kubelet.cni.packages} ''; serviceConfig = { @@ -828,7 +828,7 @@ in { }; # Allways include cni plugins - services.kubernetes.kubelet.cni.packages = [pkgs.cni]; + services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; boot.kernelModules = ["br_netfilter"]; |