imterah/kittehcluster
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(wip): Adds workaround for weird k3s issues.

Browse source
This commit is contained in:
greysoh 2024-07-19 16:19:50 -04:00
parent 968d171699
commit 714aef3b90
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
4 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nixinfra/commons.agent.nix
View file

@ -5,10 +5,20 @@ in {
./commons.nix ./commons.nix
]; ];
services.k3s = { systemd.services.k3s = {
enable = true; enable = true;
role = "agent"; description = "(manual) k3s service";
serverAddr = "https://kitteh-node-1-k3s-server:6443";
path = [
pkgs.k3s
];
serviceConfig = {
Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" ''
k3s agent --token ${services.k3s.token} --server https://kitteh-node-1-k3s-server:6443
'';
};
}; };
virtualisation.docker.enable = true; virtualisation.docker.enable = true;

17
nixinfra/commons.server.nix
View file

@ -5,11 +5,20 @@ in {
./commons.nix ./commons.nix
]; ];
services.k3s = { systemd.services.k3s = {
enable = true; enable = true;
role = "server"; description = "(manual) k3s service";
serverAddr = "https://kitteh-node-1-k3s-server:6443";
extraFlags = "--disable servicelb"; path = [
pkgs.k3s
];
serviceConfig = {
Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" ''
k3s server --token ${services.k3s.token} --server https://kitteh-node-1-k3s-server:6443 --disable servicelb
'';
};
}; };
# K3s settings # K3s settings

19
nixinfra/kitteh-node-1/server.nix
View file

@ -10,12 +10,21 @@ in {
networking.hostName = "kitteh-node-1-k3s-server"; networking.hostName = "kitteh-node-1-k3s-server";
environment.variables.NIX_BUILD_ID = "kitteh-node-1/server"; environment.variables.NIX_BUILD_ID = "kitteh-node-1/server";
services.k3s = { systemd.services.k3s = {
enable = true; enable = true;
role = "server"; description = "(manual) k3s service";
clusterInit = true;
extraFlags = "--disable servicelb"; path = [
pkgs.k3s
];
serviceConfig = {
Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" ''
k3s server --cluster-init --token ${services.k3s.token} --disable servicelb
'';
};
}; };
# K3s settings # K3s settings

8
nixinfra/update.sh
View file

@ -1,8 +1,7 @@
nix_bld_unset_err() { nix_bld_unset_err() {
echo "ERROR: You have held a (potentially) broken install!" echo "ERROR: NIX_BUILD_ID is not set (should be set by default!)"
echo "NIX_BUILD_ID is not set (should be set by default!)" echo " Please set NIX_BUILD_ID manually. i.e:"
echo "Please set NIX_BUILD_ID manually. i.e:" echo " NIX_BUILD_ID=kitteh-node-1/agent updater"
echo "NIX_BUILD_ID=kitteh-node-1/agent updater"
exit 1 exit 1
} }
@ -24,6 +23,7 @@ if [[ "$UID" != "0" ]]; then
# but this works: # but this works:
# - $: sudo su # - $: sudo su
# - #: ./update # - #: ./update
# NOTE: Calling `$: sudo ./update` still doesn't work with this hack. Just use `./update`, man.
echo "NIX_BUILD_ID=$NIX_BUILD_ID" > /tmp/nixbuildid echo "NIX_BUILD_ID=$NIX_BUILD_ID" > /tmp/nixbuildid
chmod +x /tmp/nixbuildid chmod +x /tmp/nixbuildid