mirror of
https://github.com/mulgadc/spinifex.git
synced 2026-10-15 17:11:30 +00:00
Josh Siviour
f14fb64562
* feat(eks): unify eks-server + eks-agent into one eks-node AMI Collapse the two K3s AMIs into a single spinifex-eks-node image whose role (server vs agent) is chosen per-instance at first boot, halving build time, storage, and CVE-rotation surface. - scripts/images/eks-node/: superset manifest + merged setup.sh; all role services baked but only crond + the new eks-node-role selector enabled. - eks-node-role first-boot selector reads SPINIFEX_K3S_ROLE, rc-update adds + starts the matching services (server: k3s + eks-token-webhook + k3s-first-boot publisher; agent: k3s-agent), records /etc/spinifex-eks/role, self-disables. Paths are env-overridable; eks-node-role_test.sh covers all five cases. - mulga-eks-etcd-snapshot.sh early-exits on agent nodes. - k3s_server_vm.go seeds SPINIFEX_K3S_ROLE=server into first-boot.env. - Makefile/dev-install: build-eks-node-image / import-eks-node-image replace the server+agent targets. - Delete scripts/images/eks-server + eks-agent. The launcher resolves the AMI by the spinifex:managed-by=eks tag, so running clusters (which hold the resolved AMI ID) are unaffected. AMI bake + cluster boot are operational integration steps, not yet run. * fix(eks): order eks-node-role after cloud-config/cloud-final The first-boot role selector reads /etc/spinifex-eks/first-boot.env, which cloud-init delivers via write_files in the cloud-config/cloud-final stages. The selector only depended on net+cgroups, so on a fast boot it could start before write_files landed and read a missing role env. Add an after-ordering on cloud-config + cloud-final so the env file is always present first.
31 lines
1.2 KiB
Plaintext
Executable File
31 lines
1.2 KiB
Plaintext
Executable File
#!/sbin/openrc-run
|
|
# k3s-first-boot — one-shot OpenRC service that runs the first-boot publisher
|
|
# after K3s is up. Self-disables by removing itself from the default runlevel
|
|
# once the sentinel file is gone.
|
|
|
|
description="K3s first-boot publisher (node-token + admin kubeconfig)"
|
|
# Backgrounded: the publisher waits up to 5min for K3s /healthz before it can
|
|
# read the node-token + kubeconfig, so it must not block the default runlevel.
|
|
# command_background is also required for output_log/error_log — start-stop-daemon
|
|
# rejects --stdout/--stderr without --background ("Failed to start k3s-first-boot").
|
|
command="/usr/local/sbin/k3s-first-boot"
|
|
command_background="yes"
|
|
pidfile="/run/k3s-first-boot.pid"
|
|
# Route to the serial console so the bootstrap publisher's progress (healthz
|
|
# wait, token/kubeconfig publish, errors) is visible in the orchestrator's
|
|
# host-side console capture — the VM has no operator login. Low volume.
|
|
output_log="/dev/console"
|
|
error_log="/dev/console"
|
|
|
|
depend() {
|
|
need k3s
|
|
after k3s
|
|
}
|
|
|
|
start_pre() {
|
|
if [ ! -f /var/lib/spinifex-eks/first-boot.pending ]; then
|
|
einfo "first-boot already complete; nothing to do"
|
|
return 0
|
|
fi
|
|
}
|