NyxErinys/Nix-Config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reenable ubuntu test

Browse source
This commit is contained in:
NyxErinys 2026-05-19 02:48:32 -05:00
parent 8df6097a73
commit 8937179cfd
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/k3s/default.nix
View file

@ -36,9 +36,7 @@ in
clusterInit = mkIf cfg.initServer true; clusterInit = mkIf cfg.initServer true;
serverAddr = mkIf (!cfg.initServer) "https://10.5.0.103:6443"; serverAddr = mkIf (!cfg.initServer) "https://10.5.0.103:6443";
manifests = import ./manifests.nix { inherit lib cfg inputs; }; manifests = import ./manifests.nix { inherit lib cfg inputs; };
disable = [ disable = [];
"ubuntu"
];
}; };
system.activationScripts.cleanK3sManifests = { system.activationScripts.cleanK3sManifests = {
@ -53,7 +51,7 @@ in
for file in $MANIFESTS_DIR/*.yaml; do for file in $MANIFESTS_DIR/*.yaml; do
[ -f "$file" ] || continue [ -f "$file" ] || continue
name=$(basename "$file" .yaml) name=$(basename "$file" .yaml)
if ! (echo "$NIX_MANIFESTS $DEFAULT_MANIFESTS" | grep -qw $name); then if ! (echo "$NIX_MANIFESTS $DEFAULT_MANIFESTS" | grep -qw "$name"); then
echo "Stale manifest found, deleting $name.yaml" echo "Stale manifest found, deleting $name.yaml"
k3s kubectl delete -f "$file" --ignore-not-found=true 2>/dev/null || true k3s kubectl delete -f "$file" --ignore-not-found=true 2>/dev/null || true
rm -f "$file" rm -f "$file"