kube3d: init (WIP)

yurrriq · May 19, 2021 · ab13ec8 · ab13ec8
1 parent 5e2bbee
commit ab13ec8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/machines/sruxps/home.nix b/machines/sruxps/home.nix
@@ -67,6 +67,8 @@
     renderizer
     scc
     docker-credential-helpers
+    k3s
+    kube3d
     kubectx
     stern
     zoom-us

diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
@@ -1,7 +1,11 @@
 { config, lib, pkgs, ... }:
 {
-  environment.systemPackages = lib.optionals config.virtualisation.podman.enable [ pkgs.crun ];
+  environment.systemPackages = lib.optionals config.virtualisation.podman.enable (with pkgs; [ crun tini ] );
   virtualisation = {
+    containers.containersConf.extraConfig = ''
+      [containers]
+      init_path = "${pkgs.tini}/bin/tini"
+    '';
     docker = {
       enable = lib.mkDefault false;
       liveRestore = lib.mkDefault false;

diff --git a/src/machines/sruxps/home.nw b/src/machines/sruxps/home.nw
@@ -144,6 +144,8 @@ docker-compose
 \newthought{Install some convenient Kubernetes tools.}
 
 <<Install some user packages>>=
+k3s
+kube3d
 kubectx
 stern
 @

diff --git a/src/modules/virtualisation.nw b/src/modules/virtualisation.nw
@@ -3,8 +3,12 @@
 <<modules/virtualisation.nix>>=
 { config, lib, pkgs, ... }:
 {
-  <<Install crun>>
+  <<Install crun and tini>>
   virtualisation = {
+    containers.containersConf.extraConfig = ''
+      [containers]
+      init_path = "${pkgs.tini}/bin/tini"
+    '';
     <<Configure Docker>>
     <<Configure Podman>>
   };
@@ -33,8 +37,8 @@ It seems there is a bug in podman such that it doesn't properly handle
   WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf
 \end{minted}
 
-<<Install crun>>=
-environment.systemPackages = lib.optionals config.virtualisation.podman.enable [ pkgs.crun ];
+<<Install crun and tini>>=
+environment.systemPackages = lib.optionals config.virtualisation.podman.enable (with pkgs; [ crun tini ] );
 @
 
 Install Podman by default, if the Docker daemon is disabled.