From 0d4a54664d22ee02edd6711b186ae0fef6d817f3 Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Wed, 30 Oct 2024 17:38:15 -0400 Subject: [PATCH] feat: enable k3s --- nixos/proxmox/zerotier.ts | 12 ++++++++---- nixos/secrets/flux.age | Bin 363 -> 363 bytes nixos/secrets/k3s.age | 20 ++++++++++++-------- nixos/secrets/keys.nix | 2 ++ nixos/secrets/secrets.nix | 1 - nixos/secrets/tailscale.age | 20 ++++++++++++-------- nixos/secrets/zerotier-network.age | 9 --------- nixos/server/proxmox/configuration.nix | 2 +- 8 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 nixos/secrets/zerotier-network.age diff --git a/nixos/proxmox/zerotier.ts b/nixos/proxmox/zerotier.ts index 7d79e55..e77f53d 100644 --- a/nixos/proxmox/zerotier.ts +++ b/nixos/proxmox/zerotier.ts @@ -77,10 +77,14 @@ async function _getNetwork(id: string) { } async function authorizeNode(networkId: string, nodeId: string) { - const data = await post(`/controller/network/${networkId}/member/${nodeId}`, { - authorized: true, - }); - return data; + try { + const data = await post(`/controller/network/${networkId}/member/${nodeId}`, { + authorized: true, + }); + return data; + } catch (e) { + console.error("ERROR", e); + } } async function get(url: string) { diff --git a/nixos/secrets/flux.age b/nixos/secrets/flux.age index 9dc52f67dc56b83f2deae802b7103ed4d5fd1165..d95c297c4cab57739bf26db23d59d8d4820d978b 100644 GIT binary patch delta 328 zcmV-O0k{6^0_y^hEPpvzL@{8G&x#&NJe*T zQ#o!}RSIiSOfPC`FH3cLOHyP`b461yWOy)jS7lQxHFs!eMN~0rXKXk^a!5}xV+t)k zAaiqQEoEdfH8n9gATVQVOH*ecdN)mQPj578dQEa!LUBSfOMg>RGI(x7GirD?HC8Zm zIZAeOGf^-{O>ROk3UF3IPB~FYL{CLndTd!`L2*|rHBwKWVMS7CZ&_q!QEEj>Z8t<&X?ikm z3UljEvr6LY20?O<_Op99u~LO~V|%X*YR`0elG>WS>ANzFBpaEgUUa0rDmm{tlP=Kx a(RN4i_-Yjv&OT0UTA;Z_jpO71II9UR>2~-4 delta 328 zcmV-O0k{6^0_y^hEPqUKH#j*pZ*g*Qd0}KpH)wQIMKE8b#h8gW<_l@3TtwGza8^yY;M-Wh+3Ej|24(2AUa5b^_mel7oPPO%S0K}a@=Z|#`lHhjw aRtJ0Av0nE!u0hHeJ_`WL(SNrtg$Tr%)p;@i diff --git a/nixos/secrets/k3s.age b/nixos/secrets/k3s.age index be12c94..6fbdca5 100644 --- a/nixos/secrets/k3s.age +++ b/nixos/secrets/k3s.age @@ -1,9 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 zrKLhg 9/gnI4CpuOgmTdzV8WCjIw0EbyvxXhgzxzoOaCyuYyo -a2BSn5SdJ2m8n7uV8fxVPgXVenno5p/NFhxh3rBVSps --> ssh-ed25519 Gc/MTQ YUvXIDeHGbWzY4zMIr/CYjygnzICgFzGqAFqJq6/oBo -xNA+WzCNoO/FFfbuzgbcVR8iAGLfH1rVBPVcVlcWCME --> ssh-ed25519 0ckKSg A9fln5d975BsASiit3UZ6xxy0LwOiIASSvYfEnFHDns -0ZD9aGK69MsbOYVvNqOzwH9F/1kPlGaxjTltBcibjcY ---- TZA2jaNy4LbBaabmkWpKhuVJ6Zhyz4U28OeTsfZ2ls0 -!ɑ-|\⻠_k%p2Cr+_՟,+7`wl$ \ No newline at end of file +-> ssh-ed25519 20+z4g kF+TeFqzb/syd8MmElWUbZYXJ22oKYLfzB5tY7gQKnU +3MWxc0uY6FixDG3F+GNPj8x8PDma6VyhERtE29mLPxg +-> ssh-ed25519 2OCQRA /b8POMY2M0pQi/QuOr1AA9JnmhveRP5+4qw9aSdRFEg +mPOYcmiYUVcw9fWFXbTJNxedXUAN4JFwoy7IshY1Hns +-> ssh-ed25519 zrKLhg Li8DYMWUpB/m0+J+gJr4phDjlDoNbNDN066qRjctB0Y +Y7pp544jIUFE0tw62xnlQA3sIZcQji6WpwKrl9RYgOY +-> ssh-ed25519 Gc/MTQ O6JEUj+TYLdMJxB/ZLIT+4gbd9yRt2pgycUM0qs+SRs +/cCXKnwHs1cJNqqFsFXDxDBTN97kZ4aUZUyjVC0ojWs +-> ssh-ed25519 0ckKSg FtVc+WQXvZl6IYG0jrR/fpr+obYWowL6F2u3/+HaEBQ +e/DO3HVgg1Ejd2z//FoaGFR8Na8RWSHUMgaQ1CsyAys +--- vMQZZIdxYgrwpHQn6WXmDUeLo52v3wQcrJ2IdIbVIfU +*GJzDԃ,`<>7em2>K m 8 \ No newline at end of file diff --git a/nixos/secrets/keys.nix b/nixos/secrets/keys.nix index c66df67..873e80b 100644 --- a/nixos/secrets/keys.nix +++ b/nixos/secrets/keys.nix @@ -2,4 +2,6 @@ yadunut = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXOpmWsAnl2RtOuJJMRUx+iJTwf2RWJ1iS3FqXJFzFG"; yadunut-mbp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOlXV+TevruoYChk2XbqG5+yqEklRJvOx7YdTGFfXY/f yadunut@yadunut-mbp"; premhome-gc1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCEuV81mMpBCGkVniZ9MFUPv7Wls3tQs2eZsXmWYtfo yadunut@premhome-gc1"; +premhome-falcon-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5JC6jX+aBcTTLVcUM+4mHzNgLkMs/fuP9YU/ngqld1 yadunut@premhome-falcon-1"; +premhome-eagle-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF/RiZ5Xymi0D7xWNItqxsdNmhlwlO4Sp1XwWP4BQHos yadunut@premhome-eagle-1"; } diff --git a/nixos/secrets/secrets.nix b/nixos/secrets/secrets.nix index 93b7868..dd43e0a 100644 --- a/nixos/secrets/secrets.nix +++ b/nixos/secrets/secrets.nix @@ -4,5 +4,4 @@ in { "tailscale.age".publicKeys = builtins.attrValues keys; "k3s.age".publicKeys = builtins.attrValues keys; "flux.age".publicKeys = [keys.yadunut keys.yadunut-mbp]; - "zerotier-network.age".publicKeys = builtins.attrValues keys; } diff --git a/nixos/secrets/tailscale.age b/nixos/secrets/tailscale.age index 92c4a91..934f92f 100644 --- a/nixos/secrets/tailscale.age +++ b/nixos/secrets/tailscale.age @@ -1,9 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 zrKLhg h2prq3lDy33/VrcwEtJZ+rwz+1JLLMjNC1X2QJl61kE -jMCMG+SxtefpzuyS0of0IF2u4n+YWTuOPOy0eHhag8Y --> ssh-ed25519 Gc/MTQ n9PWYJxRoTwxK39aEMFj3FTxy8SJIlVxJhcyip716Ho -kfzSsGEvpKIWhp/HLJvb5v4L+bUzbpt3uIClAUbPohc --> ssh-ed25519 0ckKSg FxLVYu7UhhXG8xprnm4GcU6/YWeng4c1tLgTvFhohjQ -qddeFW44tZNBlM7uExwrbZFH2rfz9FFnI+Cy6zToxjE ---- XtfnF0VsApoWN/9xjEUUJYfhlhdvgU6/NJRo/Gqrz+E -1>n>]&L-Bk/{3 6/o|?`Ȑ݌l_o#w&lN6}y/nv[| \ No newline at end of file +-> ssh-ed25519 20+z4g DaeHkw2O5HdH/UgwFHOd/FKiiXP8w30SubA3LoAv4XU +7oiIwd7rC2s6TtL47STbX9P2h/8J2NEjKl+bCo2a9Wc +-> ssh-ed25519 2OCQRA XgHqzJXX1NUyqHufrY0BuIdnHu3Nfb9EunUHK9jiqUs +CyEolbKdOhlPri0iApgZGNY5jucGi/Gjg4DzLVSjw9M +-> ssh-ed25519 zrKLhg hKjXH/k6CO0l8JBm1f2oxDKhT/OuwfhVNF1pghPNwFk +FTtVgjwiiJPEbIJnmH4BqluFLH8vZiBeUzkSBls8JZ8 +-> ssh-ed25519 Gc/MTQ 1Kj+fwe7MWj+bUdRuGDxtrSnZrdHBoFkk/i/OHVCuiM +GdJ5k9X8e3wFHMNMXhh2PShHQ8DPLqfxogCw5rO0VRk +-> ssh-ed25519 0ckKSg D1Xxtd1FuGIZV5cv5pUbX0IYcar39Mt1u7GEXEzqEDQ +4qu8zj6xXWa923jX0cB5guS4IXzQHGUfMbwJLsjmeoI +--- FyMruwv6hkt32d0CXo3GCYQTKpEsH1g30NSoMg4xiEI +dYiO\zv ssh-ed25519 zrKLhg Vgi+pQP4WCb1rwNVoUBxF9ph1cdCPoH8dUmOll762DQ -1QQBVmUi5BpGY//pDdhm3A+zV0wTv/jr0ULup4zLwL4 --> ssh-ed25519 Gc/MTQ Gk+rz4VSk97N+y78fNxQhkPJhHi9/2PVf2OllmfjFgI -QyeGHBcptm8287xkixlXSPLX8mqfNV/Es5aVm9qwAL4 --> ssh-ed25519 0ckKSg 1o8JhWGQZvjEAGLCVE73jn5wpsv0RbPejYr0mQXszEc -ehOMfrTeWnrU5Mw0SqGj1droDLK9on1AO4MhmPEnEK8 ---- iSiOddVkv0alfius/pcK9RMWrpZz3SvjZvQtIClrLvs -vUWP0ѕEщ3^Mu^43}:J;4 \ No newline at end of file diff --git a/nixos/server/proxmox/configuration.nix b/nixos/server/proxmox/configuration.nix index 5921e8b..5066ec9 100644 --- a/nixos/server/proxmox/configuration.nix +++ b/nixos/server/proxmox/configuration.nix @@ -45,7 +45,7 @@ }; services.k3s = { - enable = false; + enable = true; role = meta.role; tokenFile = config.age.secrets.k3s.path; clusterInit = false;