Reorganise kubernetes module

machines/atlas/configuration.nix

@@ -1,124 +1,22 @@
 {config, ...}: {
   config = {
     facter.reportPath = ./facter.json;
+    # TODO: should set this automatically
     networking.hostName = "atlas";
     system.stateVersion = "23.05";
     users.users.root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim ++ config.pim.ssh.keys.niels;
+    # TODO: set this as a default?
     sops.age.keyFile = "/root/.config/sops/age/keys.txt";
 
     deployment = {
       targetHost = "atlas";
       targetUser = "root";
-      tags = ["server"];
+      tags = ["server" "kubernetes"];
     };
 
     pim = {
       sops-nix.usersWithSopsKeys = ["root"];
-
+      k3s.serverAddr = "https://jefke.dmz:6443";
-      k3s = {
-        enable = true;
-        serverAddr = "https://jefke.dmz:6443";
-      };
-    };
-
-    disko.devices = {
-      disk = {
-        nvme = {
-          device = "/dev/nvme0n1";
-          type = "disk";
-
-          content = {
-            type = "gpt";
-
-            partitions = {
-              boot = {
-                type = "EF00";
-                size = "500M";
-
-                content = {
-                  type = "filesystem";
-                  format = "vfat";
-                  mountpoint = "/boot";
-                };
-              };
-
-              pv_os = {
-                size = "79G";
-
-                content = {
-                  type = "lvm_pv";
-                  vg = "vg_os";
-                };
-              };
-
-              pv_nvme_extra = {
-                size = "100%";
-
-                content = {
-                  type = "lvm_pv";
-                  vg = "vg_data";
-                };
-              };
-            };
-          };
-        };
-
-        sata = {
-          device = "/dev/sda";
-          type = "disk";
-
-          content = {
-            type = "gpt";
-
-            partitions.pv_sata = {
-              size = "100%";
-
-              content = {
-                type = "lvm_pv";
-                vg = "vg_data";
-              };
-            };
-          };
-        };
-      };
-
-      lvm_vg = {
-        vg_os = {
-          type = "lvm_vg";
-
-          lvs = {
-            root = {
-              size = "75G";
-
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
-                mountOptions = ["defaults"];
-              };
-            };
-
-            swap = {
-              size = "100%FREE";
-              content.type = "swap";
-            };
-          };
-        };
-
-        vg_data = {
-          type = "lvm_vg";
-
-          lvs.longhorn = {
-            size = "100%FREE";
-
-            content = {
-              type = "filesystem";
-              format = "xfs";
-              mountpoint = "/mnt/longhorn";
-            };
-          };
-        };
-      };
     };
   };
 }

nixos/default.nix

@@ -24,7 +24,7 @@
     ./desktop.nix
     ./server.nix
     ./prometheus.nix
-    ./k3s
+    ./kubernetes
   ];
 
   options = {

nixos/kubernetes/default.nix

@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./k3s
+    ./storage.nix
+  ];
+
+  config = lib.mkIf (builtins.elem "kubernetes" config.deployment.tags) {
+    pim = {
+      k3s.enable = true;
+      hasK8sStorageSetup = true;
+    };
+  };
+}

nixos/kubernetes/k3s/default.nix

@@ -163,11 +163,11 @@ in {
       k3s-certs = lib.mkIf (cfg.role == "server") {
         text = ''
           mkdir -p /var/lib/rancher/k3s/server/tls/etcd
-          cp -f ${./k3s-ca/server-ca.crt} /var/lib/rancher/k3s/server/tls/server-ca.crt
+          cp -f ${./ca/server-ca.crt} /var/lib/rancher/k3s/server/tls/server-ca.crt
-          cp -f ${./k3s-ca/client-ca.crt} /var/lib/rancher/k3s/server/tls/client-ca.crt
+          cp -f ${./ca/client-ca.crt} /var/lib/rancher/k3s/server/tls/client-ca.crt
-          cp -f ${./k3s-ca/request-header-ca.crt} /var/lib/rancher/k3s/server/tls/request-header-ca.crt
+          cp -f ${./ca/request-header-ca.crt} /var/lib/rancher/k3s/server/tls/request-header-ca.crt
-          cp -f ${./k3s-ca/etcd/peer-ca.crt} /var/lib/rancher/k3s/server/tls/etcd/peer-ca.crt
+          cp -f ${./ca/etcd/peer-ca.crt} /var/lib/rancher/k3s/server/tls/etcd/peer-ca.crt
-          cp -f ${./k3s-ca/etcd/server-ca.crt} /var/lib/rancher/k3s/server/tls/etcd/server-ca.crt
+          cp -f ${./ca/etcd/server-ca.crt} /var/lib/rancher/k3s/server/tls/etcd/server-ca.crt
         '';
       };
     };

nixos/kubernetes/storage.nix

@@ -0,0 +1,112 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  options.pim.hasK8sStorageSetup = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+  };
+
+  config = lib.mkIf config.pim.hasK8sStorageSetup {
+    disko.devices = {
+      disk = {
+        nvme = {
+          device = "/dev/nvme0n1";
+          type = "disk";
+
+          content = {
+            type = "gpt";
+
+            partitions = {
+              boot = {
+                type = "EF00";
+                size = "500M";
+
+                content = {
+                  type = "filesystem";
+                  format = "vfat";
+                  mountpoint = "/boot";
+                };
+              };
+
+              pv_os = {
+                size = "79G";
+
+                content = {
+                  type = "lvm_pv";
+                  vg = "vg_os";
+                };
+              };
+
+              pv_nvme_extra = {
+                size = "100%";
+
+                content = {
+                  type = "lvm_pv";
+                  vg = "vg_data";
+                };
+              };
+            };
+          };
+        };
+
+        sata = {
+          device = "/dev/sda";
+          type = "disk";
+
+          content = {
+            type = "gpt";
+
+            partitions.pv_sata = {
+              size = "100%";
+
+              content = {
+                type = "lvm_pv";
+                vg = "vg_data";
+              };
+            };
+          };
+        };
+      };
+
+      lvm_vg = {
+        vg_os = {
+          type = "lvm_vg";
+
+          lvs = {
+            root = {
+              size = "75G";
+
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+                mountOptions = ["defaults"];
+              };
+            };
+
+            swap = {
+              size = "100%FREE";
+              content.type = "swap";
+            };
+          };
+        };
+
+        vg_data = {
+          type = "lvm_vg";
+
+          lvs.longhorn = {
+            size = "100%FREE";
+
+            content = {
+              type = "filesystem";
+              format = "xfs";
+              mountpoint = "/mnt/longhorn";
+            };
+          };
+        };
+      };
+    };
+  };
+}