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

fix: require kubelet kubeconfig before starting service #114

Merged
micqdf merged 1 commits from stage into master 2026-03-04 20:46:48 +00:00
Conversation 0 Commits 1 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -380,7 +380,6 @@ in
after = [ "containerd.service" "network-online.target" ]; after = [ "containerd.service" "network-online.target" ];
serviceConfig = { serviceConfig = {
Environment = [ Environment = [
"KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
"KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml" "KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
"KUBELET_KUBEADM_ARGS=" "KUBELET_KUBEADM_ARGS="
"KUBELET_EXTRA_ARGS=" "KUBELET_EXTRA_ARGS="
@@ -389,12 +388,13 @@ in
"-/var/lib/kubelet/kubeadm-flags.env" "-/var/lib/kubelet/kubeadm-flags.env"
"-/etc/default/kubelet" "-/etc/default/kubelet"
]; ];
ExecStart = "${pinnedK8s}/bin/kubelet \$KUBELET_KUBECONFIG_ARGS \$KUBELET_CONFIG_ARGS \$KUBELET_KUBEADM_ARGS \$KUBELET_EXTRA_ARGS"; ExecStart = "${pinnedK8s}/bin/kubelet --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf \$KUBELET_CONFIG_ARGS \$KUBELET_KUBEADM_ARGS \$KUBELET_EXTRA_ARGS";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "10"; RestartSec = "10";
}; };
unitConfig = { unitConfig = {
ConditionPathExists = "/var/lib/kubelet/config.yaml"; ConditionPathExists = "/var/lib/kubelet/config.yaml";
ConditionPathExistsGlob = "/etc/kubernetes/*kubelet.conf";
}; };
}; };