From 6e1d5200ced185ec7823d65a3877b710b4719130 Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Fri, 11 Aug 2023 16:51:35 +0200
Subject: refactor k8s module

---
 modules/kubernetes/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'modules/kubernetes/default.nix')

diff --git a/modules/kubernetes/default.nix b/modules/kubernetes/default.nix
index 0e6e522..1cf1f09 100644
--- a/modules/kubernetes/default.nix
+++ b/modules/kubernetes/default.nix
@@ -21,10 +21,6 @@ let
     v6 = "${config.wireguard.v6.ula}::${config.wireguard.v6.address}";
   };
 in {
-  disabledModules =
-    [ "virtualisation/cri-o.nix" "services/cluster/k3s/default.nix" ];
-  imports = [ ../cri-o ../k3s ];
-
   options = {
     kubernetes = {
       role = mkOption {
@@ -64,13 +60,6 @@ in {
   };
 
   config = {
-    nixpkgs.overlays = [
-      (self: super: {
-        cri-o = super.callPackage ../../pkgs/cri-o { };
-        k3s = super.callPackage ../../pkgs/k3s { };
-      })
-    ];
-
     networking.extraHosts = ''
       10.10.0.1 ${clusterDomain}
       fd15:3d8c:d429:beef::1 ${clusterDomain}
@@ -79,9 +68,6 @@ in {
     environment.etc = {
       "k3s/config.yaml" = {
         text = generators.toJSON { } ({
-          # cluster-init = true;
-          token = "YPoyiPeBpQpB7oK8";
-
           container-runtime-endpoint = "/run/crio/crio.sock";
 
           node-ip = "${internalIP.v4},${internalIP.v6}";
@@ -118,8 +104,10 @@ in {
     services.k3s = {
       enable = true;
       role = cfg.role;
+      token = "YPoyiPeBpQpB7oK8";
       serverAddr = "https://10.10.0.1:6443";
       configPath = "/etc/k3s/config.yaml";
+      disableAgent = cfg.role == "agent";
     };
 
     virtualisation.cri-o = {
-- 
cgit v1.2.3