Recover services.k3s.extraFlags.

pdtpartners · Jan 24, 2025 · 8149a03 · 8149a03
1 parent 3b24b4b
commit 8149a03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/modules/nixos/containerd.nix b/modules/nixos/containerd.nix
@@ -10,7 +10,8 @@ let
     ];
   };
 
-in {
+in
+{
   imports = [
     ../common/containerd.nix
     ./k3s.nix
@@ -41,7 +42,7 @@ in {
       systemd.services.containerd.path = cfg.path;
     }
     (lib.mkIf cfg.k3sIntegration {
-      services.k3s.moreFlags = [
+      services.k3s.extraFlags = [
         "--container-runtime-endpoint unix:///run/containerd/containerd.sock"
       ];
 
@@ -75,7 +76,7 @@ in {
       };
     })
     (lib.mkIf (cfg.k3sIntegration && cfg.nixSnapshotterIntegration) {
-      services.k3s.moreFlags = [
+      services.k3s.extraFlags = [
         "--image-service-endpoint unix:///run/nix-snapshotter/nix-snapshotter.sock"
       ];
     })

diff --git a/modules/nixos/k3s.nix b/modules/nixos/k3s.nix
@@ -3,29 +3,18 @@ let
   inherit (lib)
     mkOption
     types
-  ;
+    ;
 
   cfg = config.services.k3s;
 
-in {
+in
+{
   imports = [
     ../common/k3s.nix
   ];
 
-  options = {
-    services.k3s = {
-      # This was introduced to provide a mergeable listOf type.
-      moreFlags = mkOption {
-        type = types.listOf types.str;
-        description = lib.mdDoc "Extra flags to pass to the k3s command.";
-        default = [];
-        example = [ "--no-deploy traefik" "--cluster-cidr 10.24.0.0/16" ];
-      };
-    };
-  };
-
   config = lib.mkIf cfg.enable {
-    environment.extraInit = 
+    environment.extraInit =
       (lib.optionalString cfg.setEmbeddedContainerd ''
         if [ -z "$CONTAINERD_ADDRESS" ]; then
           export CONTAINERD_ADDRESS="/run/k3s/containerd/containerd.sock"
@@ -43,12 +32,6 @@ in {
         fi
       '');
 
-    services.k3s = {
-      moreFlags = [ "--snapshotter ${cfg.snapshotter}" ];
-
-      extraFlags = toString cfg.moreFlags;
-    };
-
     systemd.services.k3s.path = lib.mkIf (cfg.snapshotter == "nix") [
       pkgs.nix
     ];