mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

nixos/k3s: accept a list of extraFlags

Browse Source 
Accept a list of strings for the extraFlags
option in addition to the previous single
string.
This commit is contained in:
Robert Rose 2024-07-15 22:46:52 +02:00
parent 858ad19226
commit cc2790ff1e
5 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/cluster/k3s/default.nix
View File

@ -206,9 +206,12 @@ in
extraFlags = mkOption {
description = "Extra flags to pass to the k3s command.";
type = types.str;
default = "";
example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16";
type = with types; either str (listOf str);
default = [ ];
example = [
"--no-deploy traefik"
"--cluster-cidr 10.24.0.0/16"
];
};
disableAgent = mkOption {
@ -427,7 +430,7 @@ in
++ (optional (cfg.token != "") "--token ${cfg.token}")
++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")
++ (optional (cfg.configPath != null) "--config ${cfg.configPath}")
++ [ cfg.extraFlags ]
++ (lib.flatten cfg.extraFlags)
);
};
};

2
nixos/tests/k3s/auto-deploy.nix
View File

@ -49,7 +49,7 @@ import ../make-test-python.nix (
services.k3s.role = "server";
services.k3s.package = k3s;
# Slightly reduce resource usage
services.k3s.extraFlags = builtins.toString [
services.k3s.extraFlags = [
"--disable coredns"
"--disable local-storage"
"--disable metrics-server"

20
nixos/tests/k3s/etcd.nix
View File

@ -50,20 +50,14 @@ import ../make-test-python.nix (
services.k3s = {
enable = true;
role = "server";
extraFlags = builtins.toString [
extraFlags = [
"--datastore-endpoint=\"http://192.168.1.1:2379\""
"--disable"
"coredns"
"--disable"
"local-storage"
"--disable"
"metrics-server"
"--disable"
"servicelb"
"--disable"
"traefik"
"--node-ip"
"192.168.1.2"
"--disable coredns"
"--disable local-storage"
"--disable metrics-server"
"--disable servicelb"
"--disable traefik"
"--node-ip 192.168.1.2"
];
};

23
nixos/tests/k3s/multi-node.nix
View File

@ -76,21 +76,14 @@ import ../make-test-python.nix (
role = "server";
package = k3s;
clusterInit = true;
extraFlags = builtins.toString [
"--disable"
"coredns"
"--disable"
"local-storage"
"--disable"
"metrics-server"
"--disable"
"servicelb"
"--disable"
"traefik"
"--node-ip"
"192.168.1.1"
"--pause-image"
"test.local/pause:local"
extraFlags = [
"--disable coredns"
"--disable local-storage"
"--disable metrics-server"
"--disable servicelb"
"--disable traefik"
"--node-ip 192.168.1.1"
"--pause-image test.local/pause:local"
];
};
networking.firewall.allowedTCPPorts = [

20
nixos/tests/k3s/single-node.nix
View File

@ -58,19 +58,13 @@ import ../make-test-python.nix (
services.k3s.role = "server";
services.k3s.package = k3s;
# Slightly reduce resource usage
services.k3s.extraFlags = builtins.toString [
"--disable"
"coredns"
"--disable"
"local-storage"
"--disable"
"metrics-server"
"--disable"
"servicelb"
"--disable"
"traefik"
"--pause-image"
"test.local/pause:local"
services.k3s.extraFlags = [
"--disable coredns"
"--disable local-storage"
"--disable metrics-server"
"--disable servicelb"
"--disable traefik"
"--pause-image test.local/pause:local"
];
users.users = {