github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 05:19:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1993 from likebreath/0610/clh_v16.0

Browse Source 
versions: Upgrade to cloud-hypervisor v16.0
This commit is contained in:
GabyCT
2021-06-11 15:11:11 -05:00
committed by GitHub
parent e754ff37e4 85c40001da
commit 66e4c77a54
6 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
View File

@@ -519,12 +519,8 @@ components:
net:
- tap: tap
num_queues: 9
iommu: false
queue_size: 6
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
rate_limiter_config:
ops:
size: 0
@@ -535,18 +531,19 @@ components:
one_time_burst: 0
refill_time: 0
mac: mac
vhost_mode: client
iommu: false
vhost_socket: vhost_socket
vhost_user: false
id: id
fd:
- 8
- 8
mask: 255.255.255.0
- tap: tap
num_queues: 9
iommu: false
queue_size: 6
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
rate_limiter_config:
ops:
size: 0
@@ -557,6 +554,11 @@ components:
one_time_burst: 0
refill_time: 0
mac: mac
vhost_mode: client
iommu: false
vhost_socket: vhost_socket
vhost_user: false
id: id
fd:
- 8
- 8
@@ -813,12 +815,8 @@ components:
net:
- tap: tap
num_queues: 9
iommu: false
queue_size: 6
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
rate_limiter_config:
ops:
size: 0
@@ -829,18 +827,19 @@ components:
one_time_burst: 0
refill_time: 0
mac: mac
vhost_mode: client
iommu: false
vhost_socket: vhost_socket
vhost_user: false
id: id
fd:
- 8
- 8
mask: 255.255.255.0
- tap: tap
num_queues: 9
iommu: false
queue_size: 6
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
rate_limiter_config:
ops:
size: 0
@@ -851,6 +850,11 @@ components:
one_time_burst: 0
refill_time: 0
mac: mac
vhost_mode: client
iommu: false
vhost_socket: vhost_socket
vhost_user: false
id: id
fd:
- 8
- 8
@@ -1202,12 +1206,8 @@ components:
example:
tap: tap
num_queues: 9
iommu: false
queue_size: 6
vhost_socket: vhost_socket
vhost_user: false
ip: 192.168.249.1
id: id
rate_limiter_config:
ops:
size: 0
@@ -1218,6 +1218,11 @@ components:
one_time_burst: 0
refill_time: 0
mac: mac
vhost_mode: client
iommu: false
vhost_socket: vhost_socket
vhost_user: false
id: id
fd:
- 8
- 8
@@ -1248,6 +1253,9 @@ components:
type: boolean
vhost_socket:
type: string
vhost_mode:
default: client
type: string
id:
type: string
fd:

3
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/client.go
View File

@@ -372,9 +372,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
return
}
_, err = (*f).Write(b)
if err != nil {
return
}
_, err = (*f).Seek(0, io.SeekStart)
return
}

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/docs/NetConfig.md
View File

@@ -13,6 +13,7 @@ Name | Type | Description | Notes
**QueueSize** | **int32** | | [optional] [default to 256]
**VhostUser** | **bool** | | [optional] [default to false]
**VhostSocket** | **string** | | [optional]
**VhostMode** | **string** | | [optional] [default to client]
**Id** | **string** | | [optional]
**Fd** | **[]int32** | | [optional]
**RateLimiterConfig** | [**RateLimiterConfig**](RateLimiterConfig.md) | | [optional]

1
src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go
View File

@@ -20,6 +20,7 @@ type NetConfig struct {
QueueSize int32 `json:"queue_size,omitempty"`
VhostUser bool `json:"vhost_user,omitempty"`
VhostSocket string `json:"vhost_socket,omitempty"`
VhostMode string `json:"vhost_mode,omitempty"`
Id string `json:"id,omitempty"`
Fd []int32 `json:"fd,omitempty"`
RateLimiterConfig RateLimiterConfig `json:"rate_limiter_config,omitempty"`

3
src/runtime/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
View File

@@ -712,6 +712,9 @@ components:
default: false
vhost_socket:
type: string
vhost_mode:
type: string
default: "client"
id:
type: string
fd: