Remove runtime-bundle image dependencies
Hard-cut banger away from source-checkout runtime bundles as an implicit source of\nimage and host defaults. Managed images now own their full boot set,\nimage build starts from an existing registered image, and daemon startup\nno longer synthesizes a default image from host paths.\n\nResolve Firecracker from PATH or firecracker_bin, make SSH keys config-owned\nwith an auto-managed XDG default, replace the external name generator and\npackage manifests with Go code, and keep the vsock helper as a companion\nbinary instead of a user-managed runtime asset.\n\nUpdate the manual scripts, web/CLI forms, config surface, and docs around\nthe new build/manual flow and explicit image registration semantics.\n\nValidation: GOCACHE=/tmp/banger-gocache go test ./..., bash -n scripts/*.sh,\nand make build.
This commit is contained in:
parent
01c7cb5e65
commit
572bf32424
44 changed files with 1194 additions and 3456 deletions
|
|
@ -11,7 +11,6 @@ import (
|
|||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
|
@ -85,7 +84,7 @@ func Open(ctx context.Context) (d *Daemon, err error) {
|
|||
closing: make(chan struct{}),
|
||||
pid: os.Getpid(),
|
||||
}
|
||||
d.logger.Info("daemon opened", "socket", layout.SocketPath, "state_dir", layout.StateDir, "runtime_dir", cfg.RuntimeDir, "log_level", cfg.LogLevel)
|
||||
d.logger.Info("daemon opened", "socket", layout.SocketPath, "state_dir", layout.StateDir, "log_level", cfg.LogLevel)
|
||||
if err = d.startVMDNS(vmdns.DefaultListenAddr); err != nil {
|
||||
d.logger.Error("daemon open failed", "stage", "start_vm_dns", "error", err.Error())
|
||||
return nil, err
|
||||
|
|
@ -95,10 +94,6 @@ func Open(ctx context.Context) (d *Daemon, err error) {
|
|||
_ = d.stopVMDNS()
|
||||
}
|
||||
}()
|
||||
if err = d.ensureDefaultImage(ctx); err != nil {
|
||||
d.logger.Error("daemon open failed", "stage", "ensure_default_image", "error", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
if err = d.reconcile(ctx); err != nil {
|
||||
d.logger.Error("daemon open failed", "stage", "reconcile", "error", err.Error())
|
||||
return nil, err
|
||||
|
|
@ -499,95 +494,8 @@ func (d *Daemon) stopVMDNS() error {
|
|||
}
|
||||
|
||||
func (d *Daemon) ensureDefaultImage(ctx context.Context) error {
|
||||
if d.config.DefaultImageName == "" {
|
||||
return nil
|
||||
}
|
||||
desired, ok := d.desiredDefaultImage()
|
||||
if !ok {
|
||||
if d.logger != nil {
|
||||
d.logger.Debug("default image skipped", "image_name", d.config.DefaultImageName, "rootfs_path", d.config.DefaultRootfs, "kernel_path", d.config.DefaultKernel)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
image, err := d.store.GetImageByName(ctx, d.config.DefaultImageName)
|
||||
switch {
|
||||
case err == nil:
|
||||
if image.Managed {
|
||||
if d.logger != nil {
|
||||
d.logger.Debug("managed default image left untouched", append(imageLogAttrs(image), "managed", image.Managed)...)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if defaultImageMatches(image, desired) {
|
||||
if d.logger != nil {
|
||||
d.logger.Debug("default image already current", imageLogAttrs(image)...)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
updated := desired
|
||||
updated.ID = image.ID
|
||||
updated.CreatedAt = image.CreatedAt
|
||||
updated.UpdatedAt = model.Now()
|
||||
if err := d.store.UpsertImage(ctx, updated); err != nil {
|
||||
return err
|
||||
}
|
||||
if d.logger != nil {
|
||||
d.logger.Info("default image reconciled", append(imageLogAttrs(updated), "previous_rootfs_path", image.RootfsPath, "previous_work_seed_path", image.WorkSeedPath, "previous_kernel_path", image.KernelPath)...)
|
||||
}
|
||||
return nil
|
||||
case errors.Is(err, sql.ErrNoRows):
|
||||
id, err := model.NewID()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
now := model.Now()
|
||||
desired.ID = id
|
||||
desired.CreatedAt = now
|
||||
desired.UpdatedAt = now
|
||||
if err := d.store.UpsertImage(ctx, desired); err != nil {
|
||||
return err
|
||||
}
|
||||
if d.logger != nil {
|
||||
d.logger.Info("default image registered", append(imageLogAttrs(desired), "managed", desired.Managed)...)
|
||||
}
|
||||
return nil
|
||||
default:
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
func (d *Daemon) desiredDefaultImage() (model.Image, bool) {
|
||||
rootfs := d.config.DefaultRootfs
|
||||
kernel := d.config.DefaultKernel
|
||||
if !exists(rootfs) || !exists(kernel) {
|
||||
return model.Image{}, false
|
||||
}
|
||||
return model.Image{
|
||||
Name: d.config.DefaultImageName,
|
||||
Managed: false,
|
||||
ArtifactDir: "",
|
||||
RootfsPath: rootfs,
|
||||
WorkSeedPath: d.config.DefaultWorkSeed,
|
||||
KernelPath: kernel,
|
||||
InitrdPath: d.config.DefaultInitrd,
|
||||
ModulesDir: d.config.DefaultModulesDir,
|
||||
PackagesPath: d.config.DefaultPackagesFile,
|
||||
Docker: strings.Contains(filepath.Base(rootfs), "docker"),
|
||||
}, true
|
||||
}
|
||||
|
||||
func defaultImageMatches(current, desired model.Image) bool {
|
||||
return current.Name == desired.Name &&
|
||||
current.Managed == desired.Managed &&
|
||||
current.ArtifactDir == desired.ArtifactDir &&
|
||||
current.RootfsPath == desired.RootfsPath &&
|
||||
current.WorkSeedPath == desired.WorkSeedPath &&
|
||||
current.KernelPath == desired.KernelPath &&
|
||||
current.InitrdPath == desired.InitrdPath &&
|
||||
current.ModulesDir == desired.ModulesDir &&
|
||||
current.PackagesPath == desired.PackagesPath &&
|
||||
current.Docker == desired.Docker
|
||||
_ = ctx
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *Daemon) reconcile(ctx context.Context) error {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue