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

Merge pull request 'fix: mask kubelet before rebuild, unmask in kubeadm helpers' (#86) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Failing after 24m58s
Details

Browse Source 
Reviewed-on: #86
This commit was merged in pull request #86.
This commit is contained in:
micqdf
2026-03-02 12:54:37 +00:00
parent 198c147b79 d42e83358c
commit 23d61a6308
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,6 +141,7 @@ in
--leaderElection \
> /etc/kubernetes/manifests/kube-vip.yaml
systemctl unmask kubelet || true
systemctl stop kubelet || true
env -i PATH=/run/current-system/sw/bin:/usr/bin:/bin kubeadm reset -f || true
@@ -201,6 +202,7 @@ in
--leaderElection \
> /etc/kubernetes/manifests/kube-vip.yaml
systemctl unmask kubelet || true
systemctl stop kubelet || true
eval "$1"
'')
@@ -213,6 +215,7 @@ in
exit 1
fi
systemctl unmask kubelet || true
systemctl stop kubelet || true
eval "$1"
'')

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

@@ -211,9 +211,10 @@ prepare_remote_space() {
prepare_remote_kubelet() {
local node_ip="$1"
echo "==> Quiescing kubelet on $node_ip"
remote "$node_ip" "sudo systemctl disable --now kubelet >/dev/null 2>&1 || true"
remote "$node_ip" "sudo systemctl stop kubelet >/dev/null 2>&1 || true"
remote "$node_ip" "sudo systemctl disable kubelet >/dev/null 2>&1 || true"
remote "$node_ip" "sudo systemctl mask kubelet >/dev/null 2>&1 || true"
remote "$node_ip" "sudo systemctl reset-failed kubelet >/dev/null 2>&1 || true"
remote "$node_ip" "sudo rm -f /etc/systemd/system/multi-user.target.wants/kubelet.service || true"
}
populate_nodes