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

Merge pull request 'fix: preserve kube-vip mount path and only swap hostPath to super-admin' (#98) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #98
This commit was merged in pull request #98.
This commit is contained in:
micqdf
2026-03-03 00:00:48 +00:00
parent e5162c220c 355273add5
commit 7a0016b003
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,6 +184,7 @@ in
echo "==> Creating kube-vip static pod manifest" echo "==> Creating kube-vip static pod manifest"
ctr image pull "${kubeVipImage}" ctr image pull "${kubeVipImage}"
ctr run --rm --net-host "${kubeVipImage}" kube-vip-manifest /kube-vip manifest pod \ ctr run --rm --net-host "${kubeVipImage}" kube-vip-manifest /kube-vip manifest pod \
--log -4 \
--interface "$iface" \ --interface "$iface" \
--address "$vip" \ --address "$vip" \
--controlplane \ --controlplane \
@@ -192,7 +193,9 @@ in
# kube-vip bootstrap workaround for Kubernetes >=1.29. # kube-vip bootstrap workaround for Kubernetes >=1.29.
# During early kubeadm phases, super-admin.conf is available before admin.conf is fully usable. # During early kubeadm phases, super-admin.conf is available before admin.conf is fully usable.
sed -i 's#/etc/kubernetes/admin.conf#/etc/kubernetes/super-admin.conf#g' /etc/kubernetes/manifests/kube-vip.yaml || true sed -i 's#path: /etc/kubernetes/admin.conf#path: /etc/kubernetes/super-admin.conf#' /etc/kubernetes/manifests/kube-vip.yaml || true
echo "==> kube-vip manifest kubeconfig mount"
grep -E 'mountPath:|path:' /etc/kubernetes/manifests/kube-vip.yaml | grep -E 'kubernetes/(admin|super-admin)\.conf' || 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 \
--config /tmp/kubeadm/init-config.yaml \ --config /tmp/kubeadm/init-config.yaml \
@@ -250,7 +253,7 @@ in
done done
# Switch kube-vip to normal admin.conf after bootstrap finishes. # Switch kube-vip to normal admin.conf after bootstrap finishes.
sed -i 's#/etc/kubernetes/super-admin.conf#/etc/kubernetes/admin.conf#g' /etc/kubernetes/manifests/kube-vip.yaml || true sed -i 's#path: /etc/kubernetes/super-admin.conf#path: /etc/kubernetes/admin.conf#' /etc/kubernetes/manifests/kube-vip.yaml || true
mkdir -p /root/.kube mkdir -p /root/.kube
cp /etc/kubernetes/admin.conf /root/.kube/config cp /etc/kubernetes/admin.conf /root/.kube/config
@@ -293,6 +296,7 @@ in
mkdir -p /etc/kubernetes/manifests mkdir -p /etc/kubernetes/manifests
ctr image pull "${kubeVipImage}" ctr image pull "${kubeVipImage}"
ctr run --rm --net-host "${kubeVipImage}" kube-vip /kube-vip manifest pod \ ctr run --rm --net-host "${kubeVipImage}" kube-vip /kube-vip manifest pod \
--log -4 \
--interface "$iface" \ --interface "$iface" \
--address "$vip" \ --address "$vip" \
--controlplane \ --controlplane \