Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/sergi/go-diff v1.4.0
github.com/spf13/cobra v1.10.2
github.com/stacklok/propolis v0.0.17
github.com/stacklok/propolis v0.0.18
github.com/stacklok/toolhive v0.11.2
github.com/stacklok/toolhive-core v0.0.11
github.com/stretchr/testify v1.11.1
Expand Down
10 changes: 2 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,8 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
github.com/stacklok/propolis v0.0.17 h1:gv1h0OJznVG/mrRTgSJq/HRqgHOKLaTzM+pYQ0gMiY0=
github.com/stacklok/propolis v0.0.17/go.mod h1:f0k7aMlo4EC6BhFMWasYs/RJTHc2Qb37bZu5GJvuJU0=
github.com/stacklok/propolis v0.0.18 h1:WzAqNAg2sSd7q6bJZUfEMilkzy8q/R7Ii7VtlM29dAE=
github.com/stacklok/propolis v0.0.18/go.mod h1:C727m7ggN78TJ0vok+68e+YKnZMlm1L4GlY63P4IReA=
github.com/stacklok/toolhive v0.11.2 h1:6HxvqhBlpgyL8sG351wWFIWzPx11H4krTYr2Xu6ojqM=
github.com/stacklok/toolhive v0.11.2/go.mod h1:LU04sTTWLQMLYnNohJEAiOgl0Ipn7l38aome/rKfmh4=
github.com/stacklok/toolhive-core v0.0.11 h1:tFLwSHE/AUikLYu6x7N9iTfMUR9eJS9JAVzvoPU+yrI=
Expand Down Expand Up @@ -795,8 +795,6 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
Expand Down Expand Up @@ -888,8 +886,6 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -901,8 +897,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
Expand Down
1 change: 1 addition & 0 deletions internal/infra/vm/preflight_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const kvmDevicePath = "/dev/kvm"
func buildPreflightChecker(dataDir string) preflight.Checker {
checker := preflight.NewEmpty()
checker.Register(kvmCheck())
checker.Register(preflight.UserNamespaceCheck())
checker.Register(preflight.DiskSpaceCheck(dataDir, 2.0))
checker.Register(preflight.ResourceCheck(1, 1.0))
return checker
Expand Down
4 changes: 4 additions & 0 deletions internal/infra/vm/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ func (r *PropolisRunner) Start(ctx context.Context, cfg domvm.VMConfig) (domvm.V
if r.cacheDir != "" {
backendOpts = append(backendOpts, libkrun.WithCacheDir(r.cacheDir))
}
// Spawn the runner in a user namespace so libkrun's virtiofs passthrough
// gains CAP_SETGID within the namespace. Without this, set_creds() fails
// with EPERM when host GID != guest GID.
backendOpts = append(backendOpts, libkrun.WithUserNamespaceUID(sandboxUID, sandboxGID))
if len(backendOpts) > 0 {
opts = append(opts, propolis.WithBackend(libkrun.NewBackend(backendOpts...)))
}
Expand Down
Loading