Commit Graph

2150 Commits

Author SHA1 Message Date
Eric Ernst
552e9407b8
Merge pull request #2245 from tedyu/block-index-update
vc: Sandbox#getAndSetSandboxBlockIndex shouldn't alter BlockIndex in case of error
2019-11-25 13:19:06 -08:00
Archana Shinde
545d61cbe8
Merge pull request #2253 from devimc/topic/virtcontainers/GetPatchedOCI
virtcontainers: rename GetOCISpec to GetPatchedOCISpec
2019-11-25 11:29:58 -08:00
GabyCT
d937c067f2
Merge pull request #2265 from jodh-intel/unbreak-tracing-test
tracing: Unbreak tracing test
2019-11-25 13:16:01 -06:00
Julio Montes
b7731e97dd virtcontainers: don't consider non-running container resources
Don't hot add again non-running container resources to avoid having extra
and useless resources

fixes #2186

Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-25 18:42:34 +00:00
Julio Montes
43f051313e virtcontainers: update resources after adding container to sandbox
Status of container should know prior to calculate the number of CPU
and memory

Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-25 18:42:34 +00:00
Julio Montes
613fd0fb60 virtcontainers: rename GetOCISpec to GetPatchedOCISpec
GetOCISpec returns a patched version of the original OCI spec, it was modified
to support:
* capabilities
* Ephemeral storage
* k8s empty dir

In order to avoid consusions and make api clear, rename GetOCISpec
to GetPatchedOCISpec and ContainerConfig.Spec to ContainerConfig.CustomSpec

fixes #2252

Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-25 17:22:23 +00:00
James O. D. Hunt
330cc72ef3 tracing: Unbreak tracing test
Force Jaeger to log when it reports traces to ensure the tracing test
[1] works as expected.

Fixes: #2264.

[1] - https://github.com/kata-containers/tests/blob/master/tracing/tracing-test.sh

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2019-11-25 16:48:41 +00:00
Julio Montes
dd15db3250
Merge pull request #2261 from teawater/fc_log_debug
fc.go: Set firecracker log level to debug if hypervisor.enable_debug …
2019-11-25 10:32:26 -06:00
Peng Tao
35d4cac999
Merge pull request #2257 from devimc/topic/virtcontainers/honourDontSaveSpec
virtcontainers: honour ContainerConfig struct comment and don't save OCI spec
2019-11-25 20:41:35 +08:00
Graham Whaley
6727c68005
Merge pull request #2255 from devimc/topic/virtcontainers/useMapSearch
virtcontainers: improve algorithm to find containers
2019-11-25 09:29:51 +00:00
Hui Zhu
191ee63750 fc.go: Set fc log level to debug if hypervisor.enable_debug is true
Set firecracker log level to debug if hypervisor.enable_debug is true.

Fixes: #2260

Signed-off-by: Hui Zhu <teawater@antfin.com>
2019-11-25 17:08:00 +08:00
Johan Kuijpers
7b8e15f3a7
Merge pull request #3 from kata-containers/master
Merge #3 of kata-containers/runtime
2019-11-25 09:37:27 +01:00
Hui Zhu
562d9fd5c2
Merge pull request #2073 from Pennyzct/firecracker_fifo_log
FC: extract error info from firecracker built-in log and metrics scheme
2019-11-25 16:15:36 +08:00
Julio Montes
336edf75ea virtcontainers: honour ContainerConfig struct comment and not save Spec
Currently kata-runtime saves the Container OCI Spec even when it's not needed
and a comment in `ContainerConfig struct` specifically indicates that
it won't be saved to disk.
Use '-' as json tag instead of '_' to indicates that `Spec` field shouldn't
be saved to disk.

fixes #2256

Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-22 21:16:11 +00:00
Julio Montes
7f67b9f084 virtcontainers: improve algorithm to find containers
Do not iterate over a map to find a container, use map built-in
method instead.

fixes #2254

Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-22 20:08:37 +00:00
Salvador Fuentes
fea166d8eb
Merge pull request #2250 from devimc/topic/gitignore/addClhToml
gitignore: include cloud hypervisor configuration toml
2019-11-22 11:33:34 -06:00
GabyCT
7938cd8965
Merge pull request #2208 from choury/patch-1
Respect containerd's debug config
2019-11-22 08:33:34 -06:00
Julio Montes
0ac43558c8 gitignore: include cloud hypervisor configuration toml
update .gitignore to include configuration-clh.toml to the list of
untracked files

fixes #2249

Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-22 13:39:39 +00:00
Julio Montes
0ff0e54769
Merge pull request #2217 from ericooper/clh-driver-fix-2206
Clh driver: removed hard-coded vsock contextid (cid)
2019-11-22 07:23:14 -06:00
Johan Kuijpers
1abe52abd7 clh: removed hard-coded vsock contextid (cid)
update after review 2. applied ci static checks

Fixes: #2206

Signed-off-by: Johan Kuijpers <johan.kuijpers@ericsson.com>
2019-11-22 09:35:41 +01:00
Fupan Li
eae8449231
Merge pull request #2242 from tedyu/to-disk-close
vc: Persist file handle may leak in FS#ToDisk
2019-11-22 09:12:50 +08:00
Archana Shinde
db696da98b
Merge pull request #2232 from tedyu/rm-persist-dir
vc: Clean up directories in case MkdirAll fails
2019-11-21 15:42:23 -08:00
Ted Yu
c833ac2c53 vc: BlockIndex should not be altered in case of error
BlockIndex should not increment in case of error.

Similar issue applies to decrementSandboxBlockIndex where the symptom may be more severe - in worst case, the block index may become negative.

Fixes #2244

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-21 15:34:35 -08:00
Ted Yu
b8b6733f62 vc: Persist file handle may leak in FS#ToDisk
Fixes #2241

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-21 12:42:10 -08:00
Julio Montes
a17ca14c7a
Merge pull request #2238 from tedyu/start-sandbox-running
vc: Restore sandbox state when there is error starting containers
2019-11-21 13:58:56 -06:00
Julio Montes
3a4025fbf4
Merge pull request #2234 from tedyu/close-cf
vc: Persist file handle may leak in FS#FromDisk
2019-11-21 09:38:29 -06:00
Ted Yu
03478d4540 vc: Clean up directories in case MkdirAll fails
Fixes #2230

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-21 02:27:30 -08:00
choury
51d7c23e41 shim: Respect containerd's debug config
There are too many logs from kata shim in containerd's log.
Fixes #2209

Signed-off-by: choury <chouryzhou@tencent.com>
2019-11-21 14:46:29 +08:00
Ted Yu
93a03369ae vc: Restore sandbox state when there is error starting containers
Fixes #2237

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-20 18:47:37 -08:00
Archana Shinde
88205cff6d
Merge pull request #2224 from amshinde/1.10.0-alpha1-branch-bump
# Kata Containers 1.10.0-alpha1
2019-11-20 12:21:28 -08:00
Eric Ernst
660728fb65
Merge pull request #2229 from amshinde/disable-jailer
config: Disable jailer by default for firecracker
2019-11-20 12:14:43 -08:00
Ted Yu
2331e879af vc: Persist file handle may leak in FS#FromDisk
Fixes #2233

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-20 11:48:43 -08:00
Archana Shinde
1f71114291
Merge pull request #2223 from tedyu/sandbox-anno
vc: Sandbox#Annotations should use annotationsLock read lock
2019-11-20 11:11:31 -08:00
Archana Shinde
fab759db73 config: Disable jailer by default for firecracker
Comment out jailer path so that it is disabled by default.

Fixes #2228

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
2019-11-20 09:18:56 -08:00
Fupan Li
48c8d669fe
Merge pull request #2179 from WeiZhang555/persist-storage
Support "Configuration" in "newstore" feature
2019-11-20 10:08:13 +08:00
Archana Shinde
df889c37e0 release: Kata Containers 1.10.0-alpha1
- vc: Remove unnecessary call to kill
- versions: Add cloud-hypervisor
- clh: fix build
- vc: Remove extra call to Kill
- FC: log out the firecracker's console when debug enabled
- Add support for intel cloud hypervisor
- Remove nemu
- fc: config: vhost-net not supported
- qemu-configs: update disable_vhost_net description
- Topic/network simplify
- support firecracker 0.19.0
- rootless: Fix cgroup creation logic for rootless
- FIPS: Add support for starting VM in FIPS mode.
- vc/qemu: add mutex to qmp monitor channel in qmpSetup()
- version: Update containerd version to 1.3.0
- rootless: Fix rangeUID parsing
- versions: Update kubernetes and cri-o to 1.16

1e04679 versions: Add cloud-hypervisor
618666e vc: Remove unnecessary call to kill
510f0a6 clh: fix build
ee9a53c vc: Remove extra call to Kill
784066a Makefile: clh: Use virtiofs kernel
01713d5 runtime: added cloud hypervisor driver
70297c2 nemu: remove nemu support
a2b6afc FC: log out the firecracker's console when debug enabled
13a00a2 virtcontainers: add a stateful to FC struct
0c482b2 qemu-configs: update disable_vhost_net description
519eff7 fc: config: vhost-net not supported
6154210 versions: bump firecracker version
78ca966 virtcontainers: bump firecracker minimum supported version
77b0dfb virtcontainers: use new firecracker API
0def9b0 virtcontainers/firecracker: update API
744ccd4 network: Set the default config to tcfilter
27433d9 config: Get rid of bridged model docs in the configuration
dffc988 virtcontainers: Eliminate legacy networking models
f6ffb79 rootless: Fix cgroup creation logic for rootless
0bd41b9 FIPS: Add support for starting VM in FIPS mode.
3f1a39c rootless: Fix rangeUID parsing
69ab092 versions: Add cri-tools and conmon to the versions.yaml
5b31282 vc/qemu: add mutex to qmp monitor channel in qmpSetup()
0e70b38 versions: Update kubernetes and cri-o to 1.16
62f64bb version: Update containerd version to 1.3.0

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
2019-11-20 00:13:14 +00:00
Ted Yu
1afad1c0ad vc: Sandbox#Annotations should use annotationsLock read lock
Fixes #2222

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-19 13:44:53 -08:00
Graham Whaley
66f0ec526e
Merge pull request #2216 from tedyu/kata-vc-kill
vc: Remove unnecessary call to kill
2019-11-19 17:30:18 +00:00
Jose Carlos Venegas Munoz
289b6bc587
Merge pull request #2219 from jcvenegas/ch-versions
versions: Add cloud-hypervisor
2019-11-19 10:44:02 -06:00
Ted Yu
9a4ee4f205 vc: Utilize map for newMounts to speed up replaceOCIMountSource
Fixes #2212

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-19 07:47:02 -08:00
Jose Carlos Venegas Munoz
1e046791a3 versions: Add cloud-hypervisor
Needed to build as part of release and CI process.

Fixes: #2218

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-11-19 14:25:12 +00:00
Ted Yu
618666ed8c vc: Remove unnecessary call to kill
Fixes #2207

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-19 05:46:33 -08:00
Johan Kuijpers
164fa18858
Merge pull request #2 from kata-containers/master
sync fork after merge clh driver #1
2019-11-19 12:35:45 +01:00
Wei Zhang
7943dd95b4 persistence: store configuration in newstore
Fixes #803

Store the configuration data in persist.json.

Signed-off-by: Wei Zhang <weizhang555.zw@gmail.com>
2019-11-19 18:40:19 +08:00
zhangwei_cs
c0d2867a0e
Merge pull request #2214 from bergwolf/fix-build
clh: fix build
2019-11-19 18:39:57 +08:00
Graham Whaley
45faacfe49
Merge pull request #2204 from tedyu/rm-extra-kill
vc: Remove extra call to Kill
2019-11-19 09:17:12 +00:00
Peng Tao
510f0a6687 clh: fix build
PR #2202 changed createSandbox() interface but didn't get a chance
to match with cloud hypervisor change.

Fixes: #2213

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
2019-11-19 01:02:04 -08:00
Peng Tao
be6110d234
Merge pull request #2202 from lifupan/watch_firecracker_console
FC: log out the firecracker's console when debug enabled
2019-11-19 14:06:24 +08:00
Ted Yu
ee9a53ca4b vc: Remove extra call to Kill
Fixes #2207

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-18 07:06:35 -08:00
Sebastien Boeuf
547d580ad5
Merge pull request #2164 from ericooper/ich-driver-001
Add support for intel cloud hypervisor
2019-11-15 13:22:27 -08:00