aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-30 11:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

CCv0: Merge main into CCv0 branch

Browse Source 
Merge remote-tracking branch 'upstream/main' into CCv0

Fixes: #3738
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2022-02-21 15:22:18 +00:00
parent 1559e5390c e604f83c40
commit e7e4ba9fc4
148 changed files with 4867 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/pkg/agent/protocols/client/client.go
View File

@@ -361,7 +361,7 @@ func VsockDialer(sock string, timeout time.Duration) (net.Conn, error) {
}
dialFunc := func() (net.Conn, error) {
return vsock.Dial(cid, port)
return vsock.Dial(cid, port, nil)
}
timeoutErr := grpcStatus.Errorf(codes.DeadlineExceeded, "timed out connecting to vsock %d:%d", cid, port)