From 3941e10c2f099248d62b6d11cea0f4a26d5af986 Mon Sep 17 00:00:00 2001 From: greysoh Date: Fri, 19 Jul 2024 18:14:44 -0400 Subject: [PATCH] fix: Shit on --- nixinfra/commons.agent.nix | 32 +++++++++++++++---------------- nixinfra/commons.server.nix | 32 +++++++++++++++---------------- nixinfra/kitteh-node-1/server.nix | 32 +++++++++++++++---------------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/nixinfra/commons.agent.nix b/nixinfra/commons.agent.nix index f9f0aba..a5d9013 100644 --- a/nixinfra/commons.agent.nix +++ b/nixinfra/commons.agent.nix @@ -28,23 +28,23 @@ in { serviceConfig = { Type = "simple"; ExecStart = pkgs.writeShellScript "k3s-hack" '' - if [ ! -d "/tmp/k3shack" ]; then - # Manually recreate the symlinks. Don't @ me. - mkdir /tmp/k3shack + rm -rf /tmp/k3shack - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s - fi + # Manually recreate the symlinks. Don't @ me. + mkdir /tmp/k3shack + + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s export PATH=/tmp/k3shack:$PATH 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 f6fb964..33a46e8 100644 --- a/nixinfra/commons.server.nix +++ b/nixinfra/commons.server.nix @@ -28,23 +28,23 @@ in { serviceConfig = { Type = "simple"; ExecStart = pkgs.writeShellScript "k3s-hack" '' - if [ ! -d "/tmp/k3shack" ]; then - # Manually recreate the symlinks. Don't @ me. - mkdir /tmp/k3shack + rm -rf /tmp/k3shack - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s - fi + # Manually recreate the symlinks. Don't @ me. + mkdir /tmp/k3shack + + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s export PATH=/tmp/k3shack:$PATH 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 38614b1..53b258b 100644 --- a/nixinfra/kitteh-node-1/server.nix +++ b/nixinfra/kitteh-node-1/server.nix @@ -34,23 +34,23 @@ in { serviceConfig = { Type = "simple"; ExecStart = pkgs.writeShellScript "k3s-hack" '' - if [ ! -d "/tmp/k3shack" ]; then - # Manually recreate the symlinks. Don't @ me. - mkdir /tmp/k3shack + rm -rf /tmp/k3shack - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl - ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s - fi + # Manually recreate the symlinks. Don't @ me. + mkdir /tmp/k3shack + + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/containerd + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/crictl + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/ctr + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-agent + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-certificate + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-completion + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-etcd-snapshot + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-secrets-encrypt + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-server + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s-token + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/kubectl + ln -s ${pkgs.k3s}/bin/.k3s-wrapped /tmp/k3shack/k3s export PATH=/tmp/k3shack:$PATH k3s server --cluster-init --token ${k3s_token} --disable servicelb