Skip to content

upgrade runtime-spec to 1.3.0 #63

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
samuelkarp merged 1 commit into from
Nov 6, 2025
Merged

upgrade runtime-spec to 1.3.0 #63

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
4 changes: 2 additions & 2 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3326,8 +3326,8 @@ SOFTWARE.
## github.com/opencontainers/runtime-spec/specs-go

* Name: github.com/opencontainers/runtime-spec/specs-go
* Version: v1.2.1
* License: [Apache-2.0](https://github.com/opencontainers/runtime-spec/blob/v1.2.1/LICENSE)
* Version: v1.3.0
* License: [Apache-2.0](https://github.com/opencontainers/runtime-spec/blob/v1.3.0/LICENSE)

```

Expand Down
16 changes: 6 additions & 10 deletions cmd/runj/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"path/filepath"
"strconv"

runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"go.sbk.wtf/runj/hook"
"go.sbk.wtf/runj/jail"
"go.sbk.wtf/runj/oci"
"go.sbk.wtf/runj/runtimespec"
"go.sbk.wtf/runj/state"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -167,15 +167,11 @@ written`)
Root: rootPath,
Hostname: ociConfig.Hostname,
}
if ociConfig.FreeBSD != nil && ociConfig.FreeBSD.Network != nil {
if ociConfig.FreeBSD.Network.IPv4 != nil {
jailcfg.IP4 = string(ociConfig.FreeBSD.Network.IPv4.Mode)
jailcfg.IP4Addr = ociConfig.FreeBSD.Network.IPv4.Addr
}
if ociConfig.FreeBSD.Network.VNet != nil {
jailcfg.VNet = string(ociConfig.FreeBSD.Network.VNet.Mode)
jailcfg.VNetInterface = ociConfig.FreeBSD.Network.VNet.Interfaces
}
if ociConfig.FreeBSD != nil && ociConfig.FreeBSD.Jail != nil {
jailcfg.IP4 = string(ociConfig.FreeBSD.Jail.Ip4)
jailcfg.IP4Addr = ociConfig.FreeBSD.Jail.Ip4Addr
jailcfg.VNet = string(ociConfig.FreeBSD.Jail.Vnet)
jailcfg.VNetInterface = ociConfig.FreeBSD.Jail.VnetInterfaces
}

var confPath string
Expand Down
2 changes: 1 addition & 1 deletion cmd/runj/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"errors"
"fmt"

runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"go.sbk.wtf/runj/hook"
"go.sbk.wtf/runj/jail"
"go.sbk.wtf/runj/oci"
"go.sbk.wtf/runj/runtimespec"
"go.sbk.wtf/runj/state"

"github.com/spf13/cobra"
Expand Down
12 changes: 4 additions & 8 deletions cmd/runj/demo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ import (
"os"
"path/filepath"

"go.sbk.wtf/runj/oci"

"go.sbk.wtf/runj/runtimespec"

"go.sbk.wtf/runj/demo"
"go.sbk.wtf/runj/oci"

pb "github.com/cheggaaa/pb/v3"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -180,10 +178,8 @@ func exampleSpec() *runtimespec.Spec {
Options: []string{"ruleset=4"},
}},
FreeBSD: &runtimespec.FreeBSD{
Network: &runtimespec.FreeBSDNetwork{
IPv4: &runtimespec.FreeBSDIPv4{
Mode: runtimespec.FreeBSDIPv4ModeInherit,
},
Jail: &runtimespec.FreeBSDJail{
Ip4: runtimespec.FreeBSDShareInherit,
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/runj/ext_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"
"os"

runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/spf13/cobra"
"go.sbk.wtf/runj/jail"
"go.sbk.wtf/runj/oci"
"go.sbk.wtf/runj/runtimespec"
"go.sbk.wtf/runj/state"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/moby/sys/mount v0.3.4
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.1
github.com/opencontainers/runtime-spec v1.2.1
github.com/opencontainers/runtime-spec v1.3.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.10.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,8 @@ github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.m
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU8lpJfSlR0xww=
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5diQ8ibYCRkxg=
github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
Expand Down
2 changes: 1 addition & 1 deletion hook/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os/exec"
"time"

"go.sbk.wtf/runj/runtimespec"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"go.sbk.wtf/runj/state"
)

Expand Down
2 changes: 1 addition & 1 deletion jail/mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/containerd/containerd/mount"

"go.sbk.wtf/runj/runtimespec"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
)

// Mount mounts the mounts
Expand Down
27 changes: 11 additions & 16 deletions oci/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"os"
"path/filepath"

runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"go.sbk.wtf/runj/internal/util"
"go.sbk.wtf/runj/runtimespec"
runjspec "go.sbk.wtf/runj/runtimespec"
"go.sbk.wtf/runj/state"
)

Expand Down Expand Up @@ -58,7 +59,7 @@ func LoadConfig(id string) (*runtimespec.Spec, error) {
if err != nil {
return nil, err
}
freebsd := &runtimespec.FreeBSD{}
freebsd := &runjspec.FreeBSD{}
err = json.Unmarshal(extData, freebsd)
if err != nil {
return nil, err
Expand All @@ -72,37 +73,31 @@ func LoadConfig(id string) (*runtimespec.Spec, error) {
// together. Fields specified in the original spec are preserved except in the
// case where they are overwritten. Slices the FreeBSD section are appended to
// slices specified in the original spec.
func merge(spec *runtimespec.Spec, freebsd *runtimespec.FreeBSD) {
func merge(spec *runtimespec.Spec, freebsd *runjspec.FreeBSD) {
if spec == nil || freebsd == nil {
return
}
if spec.FreeBSD == nil {
spec.FreeBSD = &runtimespec.FreeBSD{}
}
if spec.FreeBSD.Jail == nil {
spec.FreeBSD.Jail = &runtimespec.FreeBSDJail{}
}
if freebsd.Network != nil {
if spec.FreeBSD.Network == nil {
spec.FreeBSD.Network = &runtimespec.FreeBSDNetwork{}
}
if freebsd.Network.IPv4 != nil {
if spec.FreeBSD.Network.IPv4 == nil {
spec.FreeBSD.Network.IPv4 = &runtimespec.FreeBSDIPv4{}
}
if freebsd.Network.IPv4.Mode != "" {
spec.FreeBSD.Network.IPv4.Mode = freebsd.Network.IPv4.Mode
spec.FreeBSD.Jail.Ip4 = runtimespec.FreeBSDSharing(freebsd.Network.IPv4.Mode)
}
if len(freebsd.Network.IPv4.Addr) > 0 {
spec.FreeBSD.Network.IPv4.Addr = append(spec.FreeBSD.Network.IPv4.Addr, freebsd.Network.IPv4.Addr...)
spec.FreeBSD.Jail.Ip4Addr = append(spec.FreeBSD.Jail.Ip4Addr, freebsd.Network.IPv4.Addr...)
}
}
if freebsd.Network.VNet != nil {
if spec.FreeBSD.Network.VNet == nil {
spec.FreeBSD.Network.VNet = &runtimespec.FreeBSDVNet{}
}
if freebsd.Network.VNet.Mode != "" {
spec.FreeBSD.Network.VNet.Mode = freebsd.Network.VNet.Mode
spec.FreeBSD.Jail.Vnet = runtimespec.FreeBSDSharing(freebsd.Network.VNet.Mode)
}
if len(freebsd.Network.VNet.Interfaces) > 0 {
spec.FreeBSD.Network.VNet.Interfaces = append(spec.FreeBSD.Network.VNet.Interfaces, freebsd.Network.VNet.Interfaces...)
spec.FreeBSD.Jail.VnetInterfaces = append(spec.FreeBSD.Jail.VnetInterfaces, freebsd.Network.VNet.Interfaces...)
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions oci/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@ import (
"testing"

"github.com/go-faker/faker/v4"

"go.sbk.wtf/runj/runtimespec"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"gotest.tools/v3/assert"

runjspec "go.sbk.wtf/runj/runtimespec"
)

func TestMergeEmpty(t *testing.T) {
spec := &runtimespec.Spec{}
freebsd := &runtimespec.FreeBSD{}
freebsd := &runjspec.FreeBSD{}
err := faker.FakeData(freebsd)
assert.NilError(t, err)

merge(spec, freebsd)
assert.DeepEqual(t, freebsd, spec.FreeBSD)
assert.Equal(t, string(spec.FreeBSD.Jail.Vnet), string(freebsd.Network.VNet.Mode))
assert.DeepEqual(t, spec.FreeBSD.Jail.VnetInterfaces, freebsd.Network.VNet.Interfaces)
assert.Equal(t, string(spec.FreeBSD.Jail.Ip4), string(freebsd.Network.IPv4.Mode))
assert.DeepEqual(t, spec.FreeBSD.Jail.Ip4Addr, freebsd.Network.IPv4.Addr)
}
Loading
Loading