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

Merge pull request 'fix: remove kubelet ConditionPathExists, add daemon-reload' (#87) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Failing after 25m5s
Details

Browse Source 
Reviewed-on: #87
This commit was merged in pull request #87.
This commit is contained in:
micqdf
2026-03-02 14:01:06 +00:00
parent 23d61a6308 db72dcab75
commit 9d17dd17cc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,8 +143,12 @@ in
systemctl unmask kubelet || true systemctl unmask kubelet || true
systemctl stop kubelet || true systemctl stop kubelet || true
systemctl reset-failed kubelet || true
env -i PATH=/run/current-system/sw/bin:/usr/bin:/bin kubeadm reset -f || true env -i PATH=/run/current-system/sw/bin:/usr/bin:/bin kubeadm reset -f || true
systemctl daemon-reload
systemctl unmask kubelet || true
env -i PATH=/run/current-system/sw/bin:/usr/bin:/bin kubeadm init \ env -i PATH=/run/current-system/sw/bin:/usr/bin:/bin kubeadm init \
--control-plane-endpoint "$vip:6443" \ --control-plane-endpoint "$vip:6443" \
--upload-certs \ --upload-certs \
@@ -204,6 +208,8 @@ in
systemctl unmask kubelet || true systemctl unmask kubelet || true
systemctl stop kubelet || true systemctl stop kubelet || true
systemctl reset-failed kubelet || true
systemctl daemon-reload
eval "$1" eval "$1"
'') '')
@@ -217,6 +223,8 @@ in
systemctl unmask kubelet || true systemctl unmask kubelet || true
systemctl stop kubelet || true systemctl stop kubelet || true
systemctl reset-failed kubelet || true
systemctl daemon-reload
eval "$1" eval "$1"
'') '')
@@ -233,7 +241,6 @@ in
wantedBy = lib.mkForce []; wantedBy = lib.mkForce [];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "containerd.service" "network-online.target" ]; after = [ "containerd.service" "network-online.target" ];
unitConfig.ConditionPathExists = "/var/lib/kubelet/config.yaml";
serviceConfig = { serviceConfig = {
Environment = "KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"; Environment = "KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml";
EnvironmentFile = [ EnvironmentFile = [