k3s: setup on lt-hp-omen

xddxdd · Apr 23, 2024 · f5f8e81 · f5f8e81
1 parent a2b3ccc
commit f5f8e81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/home/client-apps/dev-tools.nix b/home/client-apps/dev-tools.nix
@@ -100,8 +100,10 @@ in
     # Kubernetes
     arkade
     faas-cli # OpenFaaS
+    ktop
     kubectl
     kubernetes-helm
+    lens
 
     # LaTeX
     texlive.combined.scheme-full

diff --git a/hosts/lt-hp-omen/configuration.nix b/hosts/lt-hp-omen/configuration.nix
@@ -20,6 +20,7 @@
 
     ../../nixos/optional-apps/clamav.nix
     ../../nixos/optional-apps/glauth.nix
+    ../../nixos/optional-apps/k3s.nix
     ../../nixos/optional-apps/libvirt
     ../../nixos/optional-apps/netease-cloud-music.nix
     ../../nixos/optional-apps/netns-wg-lantian.nix

diff --git a/nixos/optional-apps/k3s.nix b/nixos/optional-apps/k3s.nix
@@ -8,33 +8,8 @@
   ...
 }@args:
 {
-  systemd.enableUnifiedCgroupHierarchy = true;
-
-  systemd.services."container@k3s-server".environment = {
-    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY = "1";
-  };
-
-  systemd.tmpfiles.rules = [ "d /var/lib/k3s-server 755 root root" ];
-
-  containers.k3s-server = LT.container {
-    name = "docker";
-    ipSuffix = "230";
-
-    outerConfig = {
-      bindMounts = {
-        var-lib = {
-          hostPath = "/var/lib/k3s-server";
-          mountPoint = "/var/lib";
-          isReadOnly = false;
-        };
-      };
-    };
-
-    innerConfig = _: {
-      services.k3s = {
-        enable = true;
-        role = "server";
-      };
-    };
+  services.k3s = {
+    enable = true;
+    role = "server";
   };
 }