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

Merge pull request 'fix: ensure kubelet is enabled for kubeadm init node registration' (#102) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Failing after 10m43s
Details

Browse Source 
Reviewed-on: #102
This commit was merged in pull request #102.
This commit is contained in:
micqdf
2026-03-03 01:13:47 +00:00
parent 31017b5c3e cbb8358ce6
commit 5fa96e27d7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/kubeadm/bootstrap/controller.py
View File

@@ -212,6 +212,7 @@ class Controller:
self.remote(ip, "sudo systemctl disable kubelet >/dev/null 2>&1 || true")
self.remote(ip, "sudo systemctl mask kubelet >/dev/null 2>&1 || true")
self.remote(ip, "sudo systemctl reset-failed kubelet >/dev/null 2>&1 || true")
self.remote(ip, "sudo rm -f /var/lib/kubelet/config.yaml /var/lib/kubelet/kubeadm-flags.env || true")
def prepare_remote_space(self, ip):
self.remote(ip, "sudo nix-collect-garbage -d || true")

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

@@ -138,6 +138,7 @@ in
systemctl daemon-reload
systemctl unmask kubelet || true
systemctl enable kubelet || true
echo "==> Ensuring containerd is running"
systemctl start containerd || true
@@ -340,7 +341,6 @@ in
systemd.services.kubelet = {
description = "Kubernetes Kubelet";
wantedBy = lib.mkForce [];
wants = [ "network-online.target" ];
after = [ "containerd.service" "network-online.target" ];
serviceConfig = {