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

Merge pull request 'fix: require admin kubeconfig before skipping cp init' (#74) from stage into master
All checks were successful
Terraform Apply / Terraform Apply (push) Successful in 19m40s
Details

Browse Source 
Reviewed-on: #74
This commit was merged in pull request #74.
This commit is contained in:
micqdf
2026-03-01 23:43:29 +00:00
parent 6262f61506 fd7be1a428
commit 8103b02883
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,9 +263,10 @@ fi
echo "==> Initializing control plane on $PRIMARY_CONTROL_PLANE"
detect_ssh_user "$PRIMARY_CP_IP"
if cluster_ready; then
if has_admin_conf && cluster_ready; then
echo "==> Existing cluster detected on $PRIMARY_CONTROL_PLANE; skipping kubeadm init"
else
echo "==> Control plane not fully initialized; running kubeadm init on $PRIMARY_CONTROL_PLANE"
remote "$PRIMARY_CP_IP" "sudo th-kubeadm-init"
echo "==> Installing Cilium on $PRIMARY_CONTROL_PLANE"
@@ -281,6 +282,11 @@ if ! has_admin_conf; then
remote "$PRIMARY_CP_IP" "sudo th-kubeadm-init"
fi
if ! has_admin_conf; then
echo "==> admin.conf still missing after init attempt; aborting"
exit 1
fi
JOIN_CMD="$(remote "$PRIMARY_CP_IP" "sudo KUBECONFIG=/etc/kubernetes/admin.conf kubeadm token create --print-join-command")"
CERT_KEY="$(remote "$PRIMARY_CP_IP" "sudo KUBECONFIG=/etc/kubernetes/admin.conf kubeadm init phase upload-certs --upload-certs | tail -n 1")"
CP_JOIN_CMD="$JOIN_CMD --control-plane --certificate-key $CERT_KEY"