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

fix: The final fix.

Browse source
This commit is contained in:
greysoh 2024-07-19 17:56:29 -04:00
parent 9e7eebbdd4
commit 2298aa0b6a
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
4 changed files with 88 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

42
nixinfra/commons.agent.nix
View file

@ -10,28 +10,44 @@ in {
enable = true; enable = true;
description = "KittehCluster's modified k3s service"; description = "KittehCluster's modified k3s service";
# From L324: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/builder.nix
path = with pkgs; [
kmod
socat
iptables
iproute2
ipset
bridge-utils
ethtool
util-linux
conntrack-tools
runc
bash
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" '' ExecStart = pkgs.writeShellScript "k3s-hack" ''
if [ ! -d "/tmp/k3shack" ]; then if [ ! -d "/tmp/k3shack" ]; then
# Manually recreate the symlinks. Don't @ me. # Manually recreate the symlinks. Don't @ me.
mkdir /tmp/k3shack mkdir /tmp/k3shack
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/containerd ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/crictl ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/ctr ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-agent ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-certificate ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-completion ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-etcd-snapshot ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-secrets-encrypt ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-server ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-token ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/kubectl ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl
ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s
fi fi
export PATH=$PATH:/tmp/k3shack export PATH=$PATH:/tmp/k3shack
${pkgs.k3s}/bin/k3s agent --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443 k3s agent --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443
''; '';
}; };
}; };

2
nixinfra/commons.nix
View file

@ -40,6 +40,8 @@ in {
wantedBy = ["network-online.target"]; wantedBy = ["network-online.target"];
}; };
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
services.openssh = { services.openssh = {

42
nixinfra/commons.server.nix
View file

@ -10,28 +10,44 @@ in {
enable = true; enable = true;
description = "KittehCluster's modified k3s service"; description = "KittehCluster's modified k3s service";
# From L324: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/builder.nix
path = with pkgs; [
kmod
socat
iptables
iproute2
ipset
bridge-utils
ethtool
util-linux
conntrack-tools
runc
bash
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" '' ExecStart = pkgs.writeShellScript "k3s-hack" ''
if [ ! -d "/tmp/k3shack" ]; then if [ ! -d "/tmp/k3shack" ]; then
# Manually recreate the symlinks. Don't @ me. # Manually recreate the symlinks. Don't @ me.
mkdir /tmp/k3shack mkdir /tmp/k3shack
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/containerd ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/crictl ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/ctr ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-agent ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-certificate ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-completion ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-etcd-snapshot ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-secrets-encrypt ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-server ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-token ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/kubectl ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl
ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s
fi fi
export PATH=$PATH:/tmp/k3shack export PATH=$PATH:/tmp/k3shack
${pkgs.k3s}/bin/k3s server --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443 --disable servicelb k3s server --token ${k3s_token} --server https://kitteh-node-1-k3s-server:6443 --disable servicelb
''; '';
}; };
}; };

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

@ -16,6 +16,21 @@ in {
enable = true; enable = true;
description = "KittehCluster's modified k3s service"; description = "KittehCluster's modified k3s service";
# From L324: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/builder.nix
path = with pkgs; [
kmod
socat
iptables
iproute2
ipset
bridge-utils
ethtool
util-linux
conntrack-tools
runc
bash
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = pkgs.writeShellScript "k3s-hack" '' ExecStart = pkgs.writeShellScript "k3s-hack" ''
@ -23,21 +38,22 @@ in {
# Manually recreate the symlinks. Don't @ me. # Manually recreate the symlinks. Don't @ me.
mkdir /tmp/k3shack mkdir /tmp/k3shack
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/containerd ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/crictl ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/ctr ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-agent ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-certificate ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-completion ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-etcd-snapshot ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-secrets-encrypt ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-server ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/k3s-token ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token
ln -s ${pkgs.k3s}/bin/k3s /tmp/k3shack/kubectl ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl
ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s
fi fi
export PATH=$PATH:/tmp/k3shack export PATH=$PATH:/tmp/k3shack
${pkgs.k3s}/bin/k3s server --cluster-init --token ${k3s_token} --disable servicelb k3s server --cluster-init --token ${k3s_token} --disable servicelb
''; '';
}; };
}; };