feat(hive): Add serverNodes to the arguments
All checks were successful
Check meta / check_dns (pull_request) Successful in 20s
Check meta / check_meta (pull_request) Successful in 19s
Check workflows / check_workflows (pull_request) Successful in 24s
Build all the nodes / ap01 (pull_request) Successful in 1m9s
Build all the nodes / bridge01 (pull_request) Successful in 1m56s
Build all the nodes / geo02 (pull_request) Successful in 1m49s
Build all the nodes / geo01 (pull_request) Successful in 1m54s
Build all the nodes / compute01 (pull_request) Successful in 2m35s
Build all the nodes / rescue01 (pull_request) Successful in 2m11s
Build all the nodes / storage01 (pull_request) Successful in 2m22s
Build all the nodes / vault01 (pull_request) Successful in 2m23s
Build all the nodes / web02 (pull_request) Successful in 1m51s
Build all the nodes / web03 (pull_request) Successful in 1m34s
Run pre-commit on all files / check (pull_request) Successful in 23s
Build all the nodes / web01 (pull_request) Successful in 2m49s
Check meta / check_dns (push) Successful in 18s
Check meta / check_meta (push) Successful in 28s
Build all the nodes / ap01 (push) Successful in 1m15s
Build all the nodes / bridge01 (push) Successful in 1m50s
Build all the nodes / geo01 (push) Successful in 1m57s
Build all the nodes / geo02 (push) Successful in 1m48s
Build all the nodes / compute01 (push) Successful in 2m18s
Build all the nodes / rescue01 (push) Successful in 2m2s
Build all the nodes / storage01 (push) Successful in 2m9s
Build all the nodes / web02 (push) Successful in 1m53s
Build all the nodes / vault01 (push) Successful in 2m13s
Run pre-commit on all files / check (push) Successful in 29s
Build all the nodes / web01 (push) Successful in 2m36s
Build all the nodes / web03 (push) Successful in 1m41s

This commit is contained in:
Tom Hubrecht 2024-12-08 22:31:14 +01:00
parent 25eee32a22
commit 6d03c084a0
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
3 changed files with 10 additions and 8 deletions

View file

@ -122,9 +122,12 @@ in
evalConfig = args: import "${args.specialArgs.sourcePkgs.path}/nixos/lib/eval-config.nix" args; evalConfig = args: import "${args.specialArgs.sourcePkgs.path}/nixos/lib/eval-config.nix" args;
defaults = defaults =
{ {
lib,
name, name,
nodes,
nodeMeta, nodeMeta,
nodePath, nodePath,
meta,
sourcePkgs, sourcePkgs,
... ...
}: }:
@ -138,6 +141,10 @@ in
./modules/${category name} ./modules/${category name}
]; ];
_module.args.serverNodes = lib.filterAttrs (
name: _: meta.nodes.${name}.nixpkgs.system == "nixos"
) nodes;
# Include default secrets # Include default secrets
age-secrets.sources = [ ./${nodePath}/secrets ]; age-secrets.sources = [ ./${nodePath}/secrets ];

View file

@ -1,15 +1,13 @@
{ {
config, config,
lib, lib,
meta, serverNodes,
nodes,
sources, sources,
... ...
}: }:
let let
inherit (lib) inherit (lib)
concatLists concatLists
filterAttrs
mapAttrsToList mapAttrsToList
mkForce mkForce
mkMerge mkMerge
@ -22,8 +20,6 @@ let
probesWithTag probesWithTag
; ;
serverNodes = filterAttrs (name: _: meta.nodes.${name}.nixpkgs.system == "nixos") nodes;
probesCfg = config.statelessUptimeKuma.probesConfig; probesCfg = config.statelessUptimeKuma.probesConfig;
mkMonitors = name: builtins.attrNames (probesWithTag { inherit name; } probesCfg); mkMonitors = name: builtins.attrNames (probesWithTag { inherit name; } probesCfg);

View file

@ -1,7 +1,6 @@
{ {
config, config,
meta, serverNodes,
nodes,
lib, lib,
... ...
}: }:
@ -20,7 +19,7 @@ let
host = node; host = node;
}; };
} }
) (lib.filterAttrs (name: _: meta.nodes.${name}.nixpkgs.system == "nixos") nodes) ) serverNodes
); );
in in