diff --git a/hosts/k8s/k3s-test-1-master-1/default.nix b/hosts/k8s/k3s-test-1-master-1/default.nix index d2ac8c29..6a42651f 100644 --- a/hosts/k8s/k3s-test-1-master-1/default.nix +++ b/hosts/k8s/k3s-test-1-master-1/default.nix @@ -14,6 +14,7 @@ let inherit (myvars) networking; vcpu = 2; mem = 8192; + varSize = 20480; }; k3sModule = mylib.genK3sServerModule { inherit pkgs; diff --git a/hosts/k8s/k3s-test-1-master-2/default.nix b/hosts/k8s/k3s-test-1-master-2/default.nix index 14397dec..7c5f1200 100644 --- a/hosts/k8s/k3s-test-1-master-2/default.nix +++ b/hosts/k8s/k3s-test-1-master-2/default.nix @@ -14,6 +14,7 @@ let inherit (myvars) networking; vcpu = 2; mem = 4096; + varSize = 20480; }; k3sModule = mylib.genK3sServerModule { inherit pkgs; diff --git a/hosts/k8s/k3s-test-1-master-3/default.nix b/hosts/k8s/k3s-test-1-master-3/default.nix index 6f5c0eda..8d2fd2e0 100644 --- a/hosts/k8s/k3s-test-1-master-3/default.nix +++ b/hosts/k8s/k3s-test-1-master-3/default.nix @@ -14,6 +14,7 @@ let inherit (myvars) networking; vcpu = 2; mem = 8192; + varSize = 20480; }; k3sModule = mylib.genK3sServerModule { inherit pkgs; diff --git a/lib/genMicrovmGuestModule.nix b/lib/genMicrovmGuestModule.nix index 0c76c5a2..fea0164c 100644 --- a/lib/genMicrovmGuestModule.nix +++ b/lib/genMicrovmGuestModule.nix @@ -5,6 +5,10 @@ # vCPU count and RAM (MiB) -- mirrors the KubeVirt instancetype vcpu, mem, + # persistent volume sizes in MiB + etcSize ? 64, + varSize ? 4096, + homeSize ? 4096, # extra stateful mounts (e.g. aquamarine's /data on the passed-through HDDs) extraVolumes ? [ ], ... @@ -60,17 +64,17 @@ in { mountPoint = "/etc"; # ssh host keys (the agenix age identity!), machine-id image = "etc.img"; - size = 64; + size = etcSize; } { mountPoint = "/var"; # k3s data (/var/lib/rancher/k3s), nixos uid/gid maps image = "var.img"; - size = 4096; + size = varSize; } { mountPoint = "/home"; # user data image = "home.img"; - size = 4096; + size = homeSize; } ] ++ extraVolumes;