Add experimental Void guest workflow and vsock agent
Make iterating on a Firecracker-friendly Void guest practical without replacing the Debian default image path. Add local Void rootfs build/register/verify plumbing, a language-agnostic dev package baseline, and guest SSH/work-disk hardening so new images use the runtime bundle key, keep a normal root bash environment, and repair stale nested /root layouts on restart. Replace the guest PING/PONG responder with an HTTP /healthz agent over vsock, rename the runtime bundle and config surface from ping helper to agent while still accepting the legacy keys, and route the post-SSH reminder through the new vm.health path. Validated with GOCACHE=/tmp/banger-gocache go test ./..., make build, bash -n customize.sh make-rootfs-void.sh, and git diff --check.
This commit is contained in:
parent
c8d9a122f9
commit
3ed78fdcfc
42 changed files with 2222 additions and 388 deletions
|
|
@ -1,23 +1,19 @@
|
|||
package firecracker
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
sdk "github.com/firecracker-microvm/firecracker-go-sdk"
|
||||
models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
|
||||
sdkvsock "github.com/firecracker-microvm/firecracker-go-sdk/vsock"
|
||||
"github.com/sirupsen/logrus"
|
||||
|
||||
"banger/internal/vsockping"
|
||||
"banger/internal/vsockagent"
|
||||
)
|
||||
|
||||
type MachineConfig struct {
|
||||
|
|
@ -212,37 +208,12 @@ func newLogger(base *slog.Logger) *logrus.Entry {
|
|||
return logrus.NewEntry(logger)
|
||||
}
|
||||
|
||||
func HealthVSock(ctx context.Context, logger *slog.Logger, socketPath string) error {
|
||||
return vsockagent.Health(ctx, logger, socketPath)
|
||||
}
|
||||
|
||||
func PingVSock(ctx context.Context, logger *slog.Logger, socketPath string) error {
|
||||
conn, err := sdkvsock.DialContext(
|
||||
ctx,
|
||||
socketPath,
|
||||
vsockping.Port,
|
||||
sdkvsock.WithRetryTimeout(3*time.Second),
|
||||
sdkvsock.WithRetryInterval(100*time.Millisecond),
|
||||
sdkvsock.WithLogger(newLogger(logger)),
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
if deadline, ok := ctx.Deadline(); ok {
|
||||
_ = conn.SetDeadline(deadline)
|
||||
} else {
|
||||
_ = conn.SetDeadline(time.Now().Add(3 * time.Second))
|
||||
}
|
||||
|
||||
if _, err := io.WriteString(conn, vsockping.RequestLine); err != nil {
|
||||
return err
|
||||
}
|
||||
line, err := bufio.NewReader(conn).ReadString('\n')
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if strings.TrimSpace(line) != strings.TrimSpace(vsockping.ResponseLine) {
|
||||
return fmt.Errorf("unexpected vsock response %q", strings.TrimSpace(line))
|
||||
}
|
||||
return nil
|
||||
return HealthVSock(ctx, logger, socketPath)
|
||||
}
|
||||
|
||||
type slogHook struct {
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ func TestSDKLoggerBridgeSuppressesDebugAtInfoLevel(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestPingVSock(t *testing.T) {
|
||||
func TestHealthVSock(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
socketPath := filepath.Join(dir, "fc.vsock")
|
||||
listener, err := net.Listen("unix", socketPath)
|
||||
|
|
@ -174,22 +174,22 @@ func TestPingVSock(t *testing.T) {
|
|||
return
|
||||
}
|
||||
buf = append(buf, tmp[:n]...)
|
||||
if strings.Contains(string(buf), "\n") {
|
||||
if strings.Contains(string(buf), "\r\n\r\n") {
|
||||
break
|
||||
}
|
||||
}
|
||||
if got := string(buf); got != "PING\n" {
|
||||
if got := string(buf); !strings.Contains(got, "GET /healthz HTTP/1.1\r\n") {
|
||||
done <- errUnexpectedString(got)
|
||||
return
|
||||
}
|
||||
_, err = conn.Write([]byte("PONG\n"))
|
||||
_, err = conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: 15\r\n\r\n{\"status\":\"ok\"}"))
|
||||
done <- err
|
||||
}()
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
defer cancel()
|
||||
if err := PingVSock(ctx, nil, socketPath); err != nil {
|
||||
t.Fatalf("PingVSock: %v", err)
|
||||
if err := HealthVSock(ctx, nil, socketPath); err != nil {
|
||||
t.Fatalf("HealthVSock: %v", err)
|
||||
}
|
||||
if err := <-done; err != nil {
|
||||
t.Fatalf("server: %v", err)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue