gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/services.k3s: remove with lib;

Browse Source
This commit is contained in:
Felix Buehler
2024-09-15 10:43:47 +02:00
committed by Jörg Thalheim
parent 1a519763fb
commit 6ebec4f097
1 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/cluster/k3s/default.nix
+39 -41
View File
@@ -4,8 +4,6 @@
pkgs,
...
}:
with lib;
let
cfg = config.services.k3s;
removeOption =
@@ -98,7 +96,7 @@ let
}
);
enabledManifests = with builtins; filter (m: m.enable) (attrValues cfg.manifests);
enabledManifests = lib.filter (m: m.enable) (lib.attrValues cfg.manifests);
linkManifestEntry = m: "${pkgs.coreutils-full}/bin/ln -sfn ${m.source} ${manifestDir}/${m.target}";
linkImageEntry = image: "${pkgs.coreutils-full}/bin/ln -sfn ${image} ${imageDir}/${image.name}";
linkChartEntry =
@@ -132,11 +130,11 @@ in
# interface
options.services.k3s = {
enable = mkEnableOption "k3s";
enable = lib.mkEnableOption "k3s";
package = mkPackageOption pkgs "k3s" { };
package = lib.mkPackageOption pkgs "k3s" { };
role = mkOption {
role = lib.mkOption {
description = ''
Whether k3s should run as a server or agent.
@@ -152,14 +150,14 @@ in
- `serverAddr` is required.
'';
default = "server";
type = types.enum [
type = lib.types.enum [
"server"
"agent"
];
};
serverAddr = mkOption {
type = types.str;
serverAddr = lib.mkOption {
type = lib.types.str;
description = ''
The k3s server to connect to.
@@ -171,8 +169,8 @@ in
default = "";
};
clusterInit = mkOption {
type = types.bool;
clusterInit = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Initialize HA cluster using an embedded etcd datastore.
@@ -193,8 +191,8 @@ in
'';
};
token = mkOption {
type = types.str;
token = lib.mkOption {
type = lib.types.str;
description = ''
The k3s token to use when connecting to a server.
@@ -204,15 +202,15 @@ in
default = "";
};
tokenFile = mkOption {
type = types.nullOr types.path;
tokenFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
description = "File path containing k3s token to use when connecting to the server.";
default = null;
};
extraFlags = mkOption {
extraFlags = lib.mkOption {
description = "Extra flags to pass to the k3s command.";
type = with types; either str (listOf str);
type = with lib.types; either str (listOf str);
default = [ ];
example = [
"--no-deploy traefik"
@@ -220,28 +218,28 @@ in
];
};
disableAgent = mkOption {
type = types.bool;
disableAgent = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Only run the server. This option only makes sense for a server.";
};
environmentFile = mkOption {
type = types.nullOr types.path;
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
description = ''
File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5).
'';
default = null;
};
configPath = mkOption {
type = types.nullOr types.path;
configPath = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
description = "File path containing the k3s YAML config. This is useful when the config is generated (for example on boot).";
};
manifests = mkOption {
type = types.attrsOf manifestModule;
manifests = lib.mkOption {
type = lib.types.attrsOf manifestModule;
default = { };
example = lib.literalExpression ''
deployment.source = ../manifests/deployment.yaml;
@@ -328,8 +326,8 @@ in
'';
};
charts = mkOption {
type = with types; attrsOf (either path package);
charts = lib.mkOption {
type = with lib.types; attrsOf (either path package);
default = { };
example = lib.literalExpression ''
nginx = ../charts/my-nginx-chart.tgz;
@@ -346,8 +344,8 @@ in
'';
};
containerdConfigTemplate = mkOption {
type = types.nullOr types.str;
containerdConfigTemplate = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = lib.literalExpression ''
# Base K3s config
@@ -366,8 +364,8 @@ in
'';
};
images = mkOption {
type = with types; listOf package;
images = lib.mkOption {
type = with lib.types; listOf package;
default = [ ];
example = lib.literalExpression ''
[
@@ -440,7 +438,7 @@ in
# implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
warnings =
(lib.optional (cfg.role != "server" && cfg.manifests != { })
"k3s: Auto deploying manifests are only installed on server nodes (role == server), they will be ignored by this node."
@@ -500,7 +498,7 @@ in
"network-online.target"
];
wantedBy = [ "multi-user.target" ];
path = optional config.boot.zfs.enabled config.boot.zfs.package;
path = lib.optional config.boot.zfs.enabled config.boot.zfs.package;
serviceConfig = {
# See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
Type = if cfg.role == "agent" then "exec" else "notify";
@@ -514,15 +512,15 @@ in
TasksMax = "infinity";
EnvironmentFile = cfg.environmentFile;
ExecStartPre = activateK3sContent;
ExecStart = concatStringsSep " \\\n " (
ExecStart = lib.concatStringsSep " \\\n " (
[ "${cfg.package}/bin/k3s ${cfg.role}" ]
++ (optional cfg.clusterInit "--cluster-init")
++ (optional cfg.disableAgent "--disable-agent")
++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
++ (optional (cfg.token != "") "--token ${cfg.token}")
++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")
++ (optional (cfg.configPath != null) "--config ${cfg.configPath}")
++ (optional (kubeletParams != { }) "--kubelet-arg=config=${kubeletConfig}")
++ (lib.optional cfg.clusterInit "--cluster-init")
++ (lib.optional cfg.disableAgent "--disable-agent")
++ (lib.optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
++ (lib.optional (cfg.token != "") "--token ${cfg.token}")
++ (lib.optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")
++ (lib.optional (cfg.configPath != null) "--config ${cfg.configPath}")
++ (lib.optional (kubeletParams != { }) "--kubelet-arg=config=${kubeletConfig}")
++ (lib.flatten cfg.extraFlags)
);
};