Mirrors/JimsGarage
1
0
Fork 0
mirror of https://github.com/JamesTurland/JimsGarage.git synced 2026-07-26 18:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

K3S-Deploy: fix k3sup install and kube-vip placement (from e2e)

Browse Source 
Found running the deploy end-to-end on a multi-node cluster:
- k3sup: get.k3sup.dev leaves an arch-suffixed binary (k3sup-arm64) when
  run unprivileged; install whichever binary it produced, not a literal
  'k3sup' that may not exist.
- kube-vip: scp landed the manifest in the ssh user's home, but the mv
  ran as root (sudo bash -s) where ~ is /root; scp to /tmp and mv from
  the absolute path instead.
This commit is contained in:
cyberops7
2026-07-05 22:34:13 -06:00
parent 7e24e445aa
commit 8a33841883
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Kubernetes/K3S-Deploy/k3s.sh
View File

@@ -135,7 +135,16 @@ step "Step 1/9 · Local tools (k3sup, kubectl)"
if ! command -v k3sup &>/dev/null; then
info "Installing k3sup"
curl -sLS https://get.k3sup.dev | sh
sudo install k3sup /usr/local/bin/
# The installer leaves the binary in the CWD — named "k3sup", or
# "k3sup-<arch>" when run unprivileged (it can't self-install to
# /usr/local/bin). Install whichever it produced.
k3sup_bin=""
for f in k3sup k3sup-*; do
[[ -f "$f" ]] && { k3sup_bin="$f"; break; }
done
[[ -n "$k3sup_bin" ]] || die "k3sup installer produced no binary"
sudo install "$k3sup_bin" /usr/local/bin/k3sup
rm -f k3sup k3sup-*
else
ok "k3sup present"
fi
@@ -239,11 +248,13 @@ sed "s/REPLACE_INTERFACE/$interface/g; s/REPLACE_VIP/$vip/g" \
"$HOME/kube-vip.src" > "$HOME/kube-vip.yaml"
for node in "${masters_all[@]}"; do
info "Placing kube-vip manifest on $node"
scp "${ssh_opts[@]}" "$HOME/kube-vip.yaml" "$user@$node:~/kube-vip.yaml" >/dev/null
# scp to /tmp (absolute) — the mv below runs as root, where ~ is /root,
# not the ssh user's home where scp would otherwise land the file.
scp "${ssh_opts[@]}" "$HOME/kube-vip.yaml" "$user@$node:/tmp/kube-vip.yaml" >/dev/null
ssh "${ssh_opts[@]}" "$user@$node" 'sudo bash -s' <<'REMOTE'
set -e
mkdir -p /var/lib/rancher/k3s/server/manifests
mv ~/kube-vip.yaml /var/lib/rancher/k3s/server/manifests/kube-vip.yaml
mv /tmp/kube-vip.yaml /var/lib/rancher/k3s/server/manifests/kube-vip.yaml
chown root:root /var/lib/rancher/k3s/server/manifests/kube-vip.yaml
chmod 600 /var/lib/rancher/k3s/server/manifests/kube-vip.yaml
REMOTE