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

Compare commits

base: micqdf:adc8a620f4c8713bf75b9f89b27c204b131d3774
Branches Tags
micqdf:master micqdf:stage micqdf:destroy
micqdf:destroy/now
..
compare: micqdf:99458ca829b8b4d17cd247c6ad90cb93067906b7
Branches Tags
micqdf:master micqdf:stage micqdf:destroy
micqdf:destroy/now

2 Commits
adc8a620f4 ... 99458ca829

Author SHA1 Message Date
micqdf
99458ca829 Merge pull request 'fix: force fresh kubeadm init after rebuild and make kubelet enable-able' (#107) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Failing after 17m1s
Details 
Reviewed-on: #107
 2026-03-04 00:56:30 +00:00
MichaelFisher1997
422b7d7f23 fix: force fresh kubeadm init after rebuild and make kubelet enable-able
All checks were successful
Terraform Plan / Terraform Plan (push) Successful in 17s
Details 
Always re-run primary init when reconcile performs node rebuilds to avoid stale/partial cluster state causing join preflight failures. Also add wantedBy for kubelet so systemctl enable works as expected during join/init flows.
 2026-03-04 00:55:20 +00:00
2 changed files with 5 additions and 2 deletions
Expand all files Collapse all files

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

@@ -124,6 +124,7 @@ class Controller:
self.worker_parallelism = int(self.env.get("WORKER_PARALLELISM", "3")) self.worker_parallelism = int(self.env.get("WORKER_PARALLELISM", "3"))
self.fast_mode = self.env.get("FAST_MODE", "1") self.fast_mode = self.env.get("FAST_MODE", "1")
self.skip_rebuild = self.env.get("SKIP_REBUILD", "0") == "1" self.skip_rebuild = self.env.get("SKIP_REBUILD", "0") == "1"
self.force_reinit = False
def log(self, msg): def log(self, msg):
print(f"==> {msg}") print(f"==> {msg}")
@@ -299,6 +300,7 @@ class Controller:
raise RuntimeError(f"Worker rebuild failures: {failures}") raise RuntimeError(f"Worker rebuild failures: {failures}")
# Rebuild can invalidate prior bootstrap stages; force reconciliation. # Rebuild can invalidate prior bootstrap stages; force reconciliation.
self.force_reinit = True
self.clear_done([ self.clear_done([
"primary_initialized", "primary_initialized",
"cni_installed", "cni_installed",
@@ -316,10 +318,10 @@ class Controller:
return self.remote(self.primary_ip, cmd, check=False).returncode == 0 return self.remote(self.primary_ip, cmd, check=False).returncode == 0
def stage_init_primary(self): def stage_init_primary(self):
if self.stage_done("primary_initialized") and self.has_admin_conf() and self.cluster_ready(): if (not self.force_reinit) and self.stage_done("primary_initialized") and self.has_admin_conf() and self.cluster_ready():
self.log("Primary control plane init already complete") self.log("Primary control plane init already complete")
return return
if self.has_admin_conf() and self.cluster_ready(): if (not self.force_reinit) and self.has_admin_conf() and self.cluster_ready():
self.log("Existing cluster detected on primary control plane") self.log("Existing cluster detected on primary control plane")
else: else:
self.log(f"Initializing primary control plane on {self.primary_cp}") self.log(f"Initializing primary control plane on {self.primary_cp}")

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

@@ -343,6 +343,7 @@ in
systemd.services.kubelet = { systemd.services.kubelet = {
description = "Kubernetes Kubelet"; description = "Kubernetes Kubelet";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "containerd.service" "network-online.target" ]; after = [ "containerd.service" "network-online.target" ];
serviceConfig = { serviceConfig = {