diff --git a/configuration.nix b/configuration.nix index d660fd3..6e138ee 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,7 +13,7 @@ in cluster = { compute = true; - k8sNode = false; + k8sNode = true; }; features = { @@ -39,8 +39,8 @@ in }; k8s = { - master.enable = false; - node.enable = false; + master.enable = true; + node.enable = true; nodes = computeNodes; inherit etcdCluster; }; @@ -216,7 +216,7 @@ in description = "Proxy slurmrestd unix socet to port 6822"; serviceConfig = { # ExecStart = "-${pkgs.socat}/bin/socat -d -d -d TCP4-LISTEN:6822,fork,reuseaddr UNIX-CONNECT:/run/slurmrestd/serf.socket"; - ExecStart = "-${pkgs.socat}/bin/socat -d -d -d TCP4-LISTEN:6822,reuseaddr UNIX-CONNECT:/run/slurmrestd/serf.socket"; + ExecStart = "-${pkgs.socat}/bin/socat -d -d -d STDIO UNIX-CONNECT:/run/slurmrestd/serf.socket"; StandardInput="socket"; }; }; diff --git a/modules b/modules index 43143e7..98e5126 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 43143e7684181a7365d2be28cbd58a4690b79887 +Subproject commit 98e5126fc4b6f22e362f9dc626d4a32fc6260d4a