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

Merge pull request 'fix: hard reset kubelet identity before kubeadm init' (#109) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Failing after 12m25s
Details

Browse Source 
Reviewed-on: #109
This commit was merged in pull request #109.
This commit is contained in:
micqdf
2026-03-04 01:42:55 +00:00
parent 3fd7ed48b1 308a2fd4b7
commit 8aab666fad
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ in
echo "Using kube-vip interface: $iface" echo "Using kube-vip interface: $iface"
echo "Using kubeadm node name: $node_name" echo "Using kubeadm node name: $node_name"
hostnamectl set-hostname "$node_name" || true hostname "$node_name" || true
rm -f /var/lib/kubelet/config.yaml /var/lib/kubelet/kubeadm-flags.env rm -f /var/lib/kubelet/config.yaml /var/lib/kubelet/kubeadm-flags.env
@@ -139,6 +139,9 @@ in
systemctl stop kubelet || true systemctl stop kubelet || true
systemctl reset-failed 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
rm -f /etc/kubernetes/kubelet.conf /etc/kubernetes/bootstrap-kubelet.conf
rm -f /var/lib/kubelet/kubeconfig /var/lib/kubelet/instance-config.yaml
rm -rf /var/lib/kubelet/pki
systemctl daemon-reload systemctl daemon-reload
systemctl unmask kubelet || true systemctl unmask kubelet || true
@@ -161,6 +164,8 @@ in
nodeRegistration: nodeRegistration:
name: "KUBEADM_NODE_NAME" name: "KUBEADM_NODE_NAME"
criSocket: unix:///run/containerd/containerd.sock criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
hostname-override: "KUBEADM_NODE_NAME"
--- ---
apiVersion: kubeadm.k8s.io/v1beta4 apiVersion: kubeadm.k8s.io/v1beta4
kind: ClusterConfiguration kind: ClusterConfiguration