micqdf/TerraHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prefer root SSH for deploy and trust micqdf in nix
All checks were successful
Terraform Plan / Terraform Plan (push) Successful in 18s
Details

Browse Source
This commit is contained in:
MichaelFisher1997
2026-02-28 20:03:26 +00:00
parent 244887e9c2
commit 5c037d9a99
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/kubeadm/modules/k8s-common.nix
View File

@@ -59,6 +59,8 @@ in
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
}; };
nix.settings.trusted-users = [ "root" "micqdf" ];
environment.variables = { environment.variables = {
KUBECONFIG = "/etc/kubernetes/admin.conf"; KUBECONFIG = "/etc/kubernetes/admin.conf";
KUBE_VIP_IMAGE = kubeVipImage; KUBE_VIP_IMAGE = kubeVipImage;

2
nixos/kubeadm/scripts/rebuild-and-bootstrap.sh
View File

@@ -17,7 +17,7 @@ source "$INVENTORY_FILE"
SSH_USER="${SSH_USER:-micqdf}" SSH_USER="${SSH_USER:-micqdf}"
SSH_KEY_PATH="${SSH_KEY_PATH:-$HOME/.ssh/id_ed25519}" SSH_KEY_PATH="${SSH_KEY_PATH:-$HOME/.ssh/id_ed25519}"
SSH_OPTS="${SSH_OPTS:--o BatchMode=yes -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new -i $SSH_KEY_PATH}" SSH_OPTS="${SSH_OPTS:--o BatchMode=yes -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new -i $SSH_KEY_PATH}"
SSH_USER_CANDIDATES="${SSH_USER_CANDIDATES:-$SSH_USER root}" SSH_USER_CANDIDATES="${SSH_USER_CANDIDATES:-root $SSH_USER}"
declare -A NODE_IPS=() declare -A NODE_IPS=()
declare -a CP_NAMES=() declare -a CP_NAMES=()

2
nixos/kubeadm/scripts/reset-cluster-nodes.sh
View File

@@ -16,7 +16,7 @@ source "$INVENTORY_FILE"
SSH_USER="${SSH_USER:-micqdf}" SSH_USER="${SSH_USER:-micqdf}"
SSH_KEY_PATH="${SSH_KEY_PATH:-$HOME/.ssh/id_ed25519}" SSH_KEY_PATH="${SSH_KEY_PATH:-$HOME/.ssh/id_ed25519}"
SSH_OPTS="${SSH_OPTS:--o BatchMode=yes -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new -i $SSH_KEY_PATH}" SSH_OPTS="${SSH_OPTS:--o BatchMode=yes -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new -i $SSH_KEY_PATH}"
SSH_USER_CANDIDATES="${SSH_USER_CANDIDATES:-$SSH_USER root}" SSH_USER_CANDIDATES="${SSH_USER_CANDIDATES:-root $SSH_USER}"
declare -A NODE_IPS=() declare -A NODE_IPS=()