From 9475570b186ce882a54086b1262249b22aa6d7cb Mon Sep 17 00:00:00 2001 From: greysoh Date: Fri, 19 Jul 2024 16:47:28 -0400 Subject: [PATCH] fix: FINALLY fix all the k3s issues! With a hack, of course. :3 --- nixinfra/commons.agent.nix | 24 ++++++++++++++++++------ nixinfra/commons.server.nix | 24 ++++++++++++++++++------ nixinfra/kitteh-node-1/server.nix | 24 ++++++++++++++++++------ 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/nixinfra/commons.agent.nix b/nixinfra/commons.agent.nix index 50049c4..f3997c7 100644 --- a/nixinfra/commons.agent.nix +++ b/nixinfra/commons.agent.nix @@ -8,16 +8,28 @@ in { systemd.services.k3s = { enable = true; - description = "(manual) k3s service"; - - path = [ - pkgs.k3s - ]; + description = "KittehCluster's modified k3s service"; serviceConfig = { Type = "simple"; 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 ''; }; }; diff --git a/nixinfra/commons.server.nix b/nixinfra/commons.server.nix index 367db0d..b88d093 100644 --- a/nixinfra/commons.server.nix +++ b/nixinfra/commons.server.nix @@ -8,16 +8,28 @@ in { systemd.services.k3s = { enable = true; - description = "(manual) k3s service"; - - path = [ - pkgs.k3s - ]; + description = "KittehCluster's modified k3s service"; serviceConfig = { Type = "simple"; 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 ''; }; }; diff --git a/nixinfra/kitteh-node-1/server.nix b/nixinfra/kitteh-node-1/server.nix index 77383d4..821d20b 100644 --- a/nixinfra/kitteh-node-1/server.nix +++ b/nixinfra/kitteh-node-1/server.nix @@ -14,16 +14,28 @@ in { systemd.services.k3s = { enable = true; - description = "(manual) k3s service"; - - path = [ - pkgs.k3s - ]; + description = "KittehCluster's modified k3s service"; serviceConfig = { Type = "simple"; 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 ''; }; };