[sruxps] feat: add kube3d

yurrriq · May 2, 2023 · eefe981 · eefe981
1 parent f748d73
commit eefe981
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
@@ -58,7 +58,9 @@
     scc
     docker-credential-helpers
     # TODO: podman-compose
+    k3s
     krew
+    kube3d
     kubectl
     kubectx
     kubelogin

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
@@ -143,7 +143,9 @@ docker-compose
 \newthought{Install some convenient Kubernetes tools.}
 
 <<Install some user packages>>=
+k3s
 krew
+kube3d
 kubectl
 kubectx
 kubelogin

diff --git a/src/modules/virtualisation.nw b/src/modules/virtualisation.nw
@@ -4,8 +4,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>>
     <<Configure VirtualBox>>
@@ -35,8 +39,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.