diff --git a/aliases.nix b/aliases.nix index a15ac90..2323226 100644 --- a/aliases.nix +++ b/aliases.nix @@ -27,6 +27,7 @@ r = "nix run"; wipe = "sudo rm -fr /var/lib/microvms/kube-* || sudo rm -fr /var/lib/microvms/shared/kube"; wg-keys = "wg genkey > privatekey && wg pubkey < privatekey > publickey"; + k = "kubectl"; }; diff --git a/modules/nfs.nix b/modules/nfs.nix index 251c71a..772fba0 100644 --- a/modules/nfs.nix +++ b/modules/nfs.nix @@ -1,12 +1,14 @@ { pkgs, ... }: { - fileSystems."/export/mafuyu" = { + environment.systemPackages = with pkgs; [ kubernetes-helm ]; + + fileSystems."/export" = { device = "/kube-store"; options = [ "bind" ]; }; services.nfs.server.enable = true; services.nfs.server.exports = '' - /export 10.0.0.0/42(rw,fsid=0,no_subtree_check) + /export 10.0.0.0/24(rw,fsid=0,no_subtree_check,crossmnt,no_root_squash) ''; } diff --git a/programs.nix b/programs.nix index 47258c8..3279dbd 100644 --- a/programs.nix +++ b/programs.nix @@ -20,6 +20,7 @@ p7zip kubectl lua5_1 + jq luarocks vtk immich-cli diff --git a/vms/kube-daddy/jelly-forward.nix b/vms/kube-daddy/jelly-forward.nix new file mode 100644 index 0000000..f422995 --- /dev/null +++ b/vms/kube-daddy/jelly-forward.nix @@ -0,0 +1,26 @@ +{ + pkgs, + ... +}: +{ + systemd.services."jelly-forward" = { + description = "forwards jellyfin running on kubernetes"; + + after = [ + "network-online.target" + "microvm@kubernetes.service" + ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + script = '' + sleep 5 + ${pkgs.kubernetes}/bin/kubectl port-forward jellyfin -n argocd 8096:8096 --address 0.0.0.0 || true + ''; + + serviceConfig = { + User = "root"; + Restart = "always"; + }; + }; +} diff --git a/vms/kube-daddy/kubernetes.nix b/vms/kube-daddy/kubernetes.nix index 330a996..4fe2e9b 100644 --- a/vms/kube-daddy/kubernetes.nix +++ b/vms/kube-daddy/kubernetes.nix @@ -22,6 +22,7 @@ in imports = [ ./argo-forward.nix + ./jelly-forward.nix ./longhorn-deps.nix ]; diff --git a/vms/kube-vm/kubernetes.nix b/vms/kube-vm/kubernetes.nix index 7a0024f..dd5f7cc 100644 --- a/vms/kube-vm/kubernetes.nix +++ b/vms/kube-vm/kubernetes.nix @@ -10,7 +10,12 @@ in networking.firewall.enable = false; # packages for administration tasks - environment.systemPackages = with pkgs; [ kompose kubectl kubernetes ]; + environment.systemPackages = with pkgs; [ + kompose + kubectl + kubernetes + kubernetes-helm + ]; services.kubernetes = let @@ -33,4 +38,3 @@ in kubelet.extraOpts = "--fail-swap-on=false"; }; } -