Skip to content

fix(bootstrap-k0s): align VyOS runtime wiring #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmgilman merged 1 commit into from
May 1, 2026
Merged

fix(bootstrap-k0s): align VyOS runtime wiring #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bootstrap/k0s/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN cue export /tmp/providers.cue \
FROM ${K0S_IMAGE}

COPY bootstrap/k0s/k0s.cue /opt/bootstrap/k0s.cue
COPY bootstrap/k0s/manifests/providers/namespaces.yaml /var/lib/k0s/manifests/providers/00-namespaces.yaml
COPY bootstrap/k0s/manifests/providers/namespaces.yaml /opt/bootstrap/providers/namespaces.yaml
COPY bootstrap/k0s/bootstrap-k0s.sh /usr/local/bin/bootstrap-k0s.sh
COPY --from=chart-builder /usr/local/bin/cue /usr/local/bin/cue
COPY --from=chart-builder /out/cert-manager.tgz /opt/bootstrap/charts/cert-manager.tgz
Expand All @@ -92,8 +92,8 @@ COPY --from=chart-builder /out/providers.yaml /opt/bootstrap/providers/providers

ENV K0S_ENTRYPOINT_ROLE=controller+worker

# Namespace manifests are always present; provider CRs are staged later by the
# helper once the operator CRDs and webhook are available.
# Provider namespaces are staged from /opt because /var/lib/k0s is mounted at
# runtime. Provider CRs are staged later once the operator webhook is ready.
RUN mkdir -p /etc/k0s /opt/bootstrap/charts \
&& chmod 0755 /usr/local/bin/bootstrap-k0s.sh

Expand Down
4 changes: 4 additions & 0 deletions bootstrap/k0s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ TINKERBELL_ARTIFACTS_FILE_SERVER=http://10.10.20.1:7173
TINKERBELL_DHCP_BIND_INTERFACE=eth1.20
```

The VyOS-hosted bootstrap path leaves DHCP with VyOS/Kea. Tinkerbell's DHCP
listener is disabled, while its HTTP, TFTP, gRPC, and SSH listeners bind to
`TINKERBELL_PUBLIC_IP`.

For local smoke runs, set `TINKERBELL_DHCP_BIND_INTERFACE` to an interface that
actually exists inside the disposable bootstrap container, such as `eth0`.

Expand Down
5 changes: 4 additions & 1 deletion bootstrap/k0s/bootstrap-k0s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/sh
set -eu

provider_namespaces_src="/opt/bootstrap/providers/namespaces.yaml"
provider_src="/opt/bootstrap/providers/providers.yaml"
provider_dst_dir="/var/lib/k0s/manifests/providers"
provider_namespaces_dst="${provider_dst_dir}/00-namespaces.yaml"
provider_dst="${provider_dst_dir}/10-providers.yaml"
k0s_source="/opt/bootstrap/k0s.cue"
k0s_config="/etc/k0s/k0s.yaml"
Expand Down Expand Up @@ -50,6 +52,8 @@ render_k0s_config() {
}

render_k0s_config
mkdir -p "$provider_dst_dir"
cp "$provider_namespaces_src" "$provider_namespaces_dst"

echo "starting k0s bootstrap controller"
k0s controller --config "$k0s_config" --single --ignore-pre-flight-checks &
Expand Down Expand Up @@ -88,7 +92,6 @@ while :; do

if k0s kubectl --request-timeout=5s apply --dry-run=server -f "$provider_src" >/dev/null 2>&1; then
echo "operator API is ready; handing provider manifests to k0s manifest deployer"
mkdir -p "$provider_dst_dir"
cp "$provider_src" "$provider_dst"
break
fi
Expand Down
6 changes: 5 additions & 1 deletion bootstrap/k0s/k0s.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ cfgTrustedProxies: [for proxy in strings.Split(cfgTrustedProxiesCSV, ",") if str
type: "ClusterIP"
}
deployment: {
additionalEnvs: [{
name: "TINKERBELL_BIND_ADDRESS"
value: cfgPublicIP
}]
hostNetwork: true
init: {
enabled: false
Expand All @@ -48,7 +52,7 @@ cfgTrustedProxies: [for proxy in strings.Split(cfgTrustedProxiesCSV, ",") if str
bindAddr: "0.0.0.0"
}
smee: {
dhcpEnabled: true
dhcpEnabled: false
dhcpMode: cfgDHCPMode
dhcpBindInterface: cfgDHCPBindInterface
dhcpIPForPacket: cfgPublicIP
Expand Down
Loading