summary refs log tree commit diff
path: root/nixos/modules/services/cluster
diff options
context:
space:
mode:
authorAlexandru Scvortov <code@scvalex.net>2021-06-28 20:33:17 +0100
committerAlexandru Scvortov <code@scvalex.net>2021-06-28 20:33:17 +0100
commitab1567e8121dfcdb4f7a395b39a3a345f41c7474 (patch)
treec55f080da9e56645b240531f61233694b521e661 /nixos/modules/services/cluster
parente34f40b92b77ea8346d413e6a40639dde71c200d (diff)
downloadnixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.tar
nixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.tar.gz
nixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.tar.bz2
nixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.tar.lz
nixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.tar.xz
nixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.tar.zst
nixpkgs-ab1567e8121dfcdb4f7a395b39a3a345f41c7474.zip
kubernetes: fix conntrack-tools package name, missing dir, and tests
Diffstat (limited to 'nixos/modules/services/cluster')
-rw-r--r--nixos/modules/services/cluster/kubernetes/pki.nix1
-rw-r--r--nixos/modules/services/cluster/kubernetes/proxy.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix
index 8de6a3ba0d8..d9311d3e3a0 100644
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@@ -189,6 +189,7 @@ in
         # manually paste it in place. Just symlink.
         # otherwise, create the target file, ready for users to insert the token
 
+        mkdir -p $(dirname ${certmgrAPITokenPath})
         if [ -f "${cfsslAPITokenPath}" ]; then
           ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}"
         else
diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix
index 7aa449f9aa2..42729f54643 100644
--- a/nixos/modules/services/cluster/kubernetes/proxy.nix
+++ b/nixos/modules/services/cluster/kubernetes/proxy.nix
@@ -59,7 +59,7 @@ in
       description = "Kubernetes Proxy Service";
       wantedBy = [ "kubernetes.target" ];
       after = [ "kube-apiserver.service" ];
-      path = with pkgs; [ iptables conntrack_tools ];
+      path = with pkgs; [ iptables conntrack-tools ];
       serviceConfig = {
         Slice = "kubernetes.slice";
         ExecStart = ''${top.package}/bin/kube-proxy \