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

fix: FINALLY fix all the k3s issues!

Browse source 
With a hack, of course. :3
This commit is contained in:
greysoh 2024-07-19 16:47:28 -04:00
parent c5d8bbc7b0
commit 9475570b18
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
3 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nixinfra/commons.agent.nix
View file

@ -8,16 +8,28 @@ in {
systemd.services.k3s = { systemd.services.k3s = {
enable = true; enable = true;
description = "(manual) k3s service"; description = "KittehCluster's modified k3s service";
path = [
pkgs.k3s
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" '' ExecStart = pkgs.writeShellScript "k3s-hack" ''
k3s agent --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443 if [ ! -d "/tmp/k3shack" ]; then
# Manually recreate the symlinks. Don't @ me.
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/containerd
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/crictl
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/ctr
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-agent
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-certificate
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-completion
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-etcd-snapshot
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-secrets-encrypt
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-server
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-token
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/kubectl
fi
export PATH=$PATH:/tmp/k3shack
${pkgs.k3s}/bin/k3s agent --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443
''; '';
}; };
}; };

24
nixinfra/commons.server.nix
View file

@ -8,16 +8,28 @@ in {
systemd.services.k3s = { systemd.services.k3s = {
enable = true; enable = true;
description = "(manual) k3s service"; description = "KittehCluster's modified k3s service";
path = [
pkgs.k3s
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" '' ExecStart = pkgs.writeShellScript "k3s-hack" ''
k3s server --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443 --disable servicelb if [ ! -d "/tmp/k3shack" ]; then
# Manually recreate the symlinks. Don't @ me.
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/containerd
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/crictl
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/ctr
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-agent
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-certificate
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-completion
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-etcd-snapshot
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-secrets-encrypt
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-server
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-token
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/kubectl
fi
export PATH=$PATH:/tmp/k3shack
${pkgs.k3s}/bin/k3s server --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443 --disable servicelb
''; '';
}; };
}; };

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

@ -14,16 +14,28 @@ in {
systemd.services.k3s = { systemd.services.k3s = {
enable = true; enable = true;
description = "(manual) k3s service"; description = "KittehCluster's modified k3s service";
path = [
pkgs.k3s
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" '' ExecStart = pkgs.writeShellScript "k3s-hack" ''
k3s server --cluster-init --token ${k3s_token} --disable servicelb if [ ! -d "/tmp/k3shack" ]; then
# Manually recreate the symlinks. Don't @ me.
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/containerd
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/crictl
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/ctr
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-agent
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-certificate
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-completion
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-etcd-snapshot
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-secrets-encrypt
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-server
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-token
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/kubectl
fi
export PATH=$PATH:/tmp/k3shack
${pkgs.k3s}/bin/k3s server --cluster-init --token ${k3s_token} --disable servicelb
''; '';
}; };
}; };