github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 18:04:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6408 from jongwu/nydus_rm_hybrid

Browse Source 
nydus: upgrad to v2.2.0
This commit is contained in:
Bin Liu
2023-03-28 11:07:56 +08:00
committed by GitHub
parent 4a95375dc8 3443f558a6
commit 75987aae72
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/nydusd.go
View File

@@ -157,7 +157,7 @@ func (nd *nydusd) args() ([]string, error) {
logLevel = "debug" logLevel = "debug"
} }
args := []string{ args := []string{
"virtiofs", "--hybrid-mode", "virtiofs",
"--log-level", logLevel, "--log-level", logLevel,
"--apisock", nd.apiSockPath, "--apisock", nd.apiSockPath,
"--sock", nd.sockPath, "--sock", nd.sockPath,

4
src/runtime/virtcontainers/nydusd_test.go
View File

@@ -99,13 +99,13 @@ func TestNydusdArgs(t *testing.T) {
apiSockPath: "/var/lib/api.sock", apiSockPath: "/var/lib/api.sock",
debug: true, debug: true,
} }
expected := "virtiofs --hybrid-mode --log-level debug --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock" expected := "virtiofs --log-level debug --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock"
args, err := nd.args() args, err := nd.args()
assert.NoError(err) assert.NoError(err)
assert.Equal(expected, strings.Join(args, " ")) assert.Equal(expected, strings.Join(args, " "))
nd.debug = false nd.debug = false
expected = "virtiofs --hybrid-mode --log-level info --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock" expected = "virtiofs --log-level info --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock"
args, err = nd.args() args, err = nd.args()
assert.NoError(err) assert.NoError(err)
assert.Equal(expected, strings.Join(args, " ")) assert.Equal(expected, strings.Join(args, " "))

2
versions.yaml
View File

@@ -254,7 +254,7 @@ externals:
nydus: nydus:
description: "Nydus image acceleration service" description: "Nydus image acceleration service"
url: "https://github.com/dragonflyoss/image-service" url: "https://github.com/dragonflyoss/image-service"
version: "v2.1.1" version: "v2.2.0"
nydus-snapshotter: nydus-snapshotter:
description: "Snapshotter for Nydus image acceleration service" description: "Snapshotter for Nydus image acceleration service"