aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-14 20:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,553 Commits 30 Branches 115 Tags
196e8d81cfe142e51929219bbee0f647f5ebfe4e
Commit Graph

296 Commits

Author SHA1 Message Date
Julio Montes
196e8d81cf Merge pull request #1032 from devimc/2020-10-21/unitests/container.rs 
Improve unit test coverage for rustjail/container.rs
 2020-10-28 16:08:23 -06:00
Julio Montes
9e93463bb6 agent/rustjail: improve unit test coverage for rustjail/container.rs 
Improve unit test coverage for rustjail/container.rs

fixes #282

Signed-off-by: Julio Montes <julio.montes@intel.com>
 2020-10-27 09:28:38 -06:00
Julio Montes
ad4f7b86f2 agent/rustjail: make mount and umount2 public 
make mount and umount2 public, this way they can be
used in other files

Signed-off-by: Julio Montes <julio.montes@intel.com>
 2020-10-27 09:28:38 -06:00
Julio Montes
926a618624 agent/rustjail: fix typo 
not suppoerted  ->  not supported

Signed-off-by: Julio Montes <julio.montes@intel.com>
 2020-10-27 09:28:38 -06:00
Julio Montes
8130d9b2dd agent/rustjail: don't use unwrap in container::oci_state 
replace unwrap with `match` statements, this way we can write
unit tests that don't panic

Signed-off-by: Julio Montes <julio.montes@intel.com>
 2020-10-27 09:28:38 -06:00
Julio Montes
5d111071be rustjail: add mock implementation for cgroup manager 
Only root is able to create and manipulate cgroups, this mock
implementation of a cgroup manager can used in unit testing.

Signed-off-by: Julio Montes <julio.montes@intel.com>
 2020-10-27 09:28:38 -06:00
James O. D. Hunt
157dd041b2 Merge pull request #895 from Apokleos/dev 
agent: Update build instructions
 2020-10-27 14:54:51 +00:00
LiYa'nan
e3eff0eb15 agent: Update build instructions 
Fix the instructions explaining how to build the agent from source now that make needs to be run to auto-generate some source files.

Fixes: #889.

Signed-off-by: LiYa'nan <oliverliyn@gmail.com>
 2020-10-27 01:19:21 +00:00
Peng Tao
0896ce80a4 agent: update proto file copyright 
Now that it is Ant Group...

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
 2020-10-26 16:03:47 +08:00
Peng Tao
6e9ca45732 agent: generate proto files properly 
Need to generate all protos.

Depends-on: github.com/kata-containers/tests#3006
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
 2020-10-25 11:27:00 +08:00
Peng Tao
54e23c8302 agent: move gogo.proto out of the github.com namespance 
To follow the same namespace scope as other proto files.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
 2020-10-25 10:44:53 +08:00
Peng Tao
74a155c65b Merge pull request #1023 from lifupan/fix_stdio 
agent: fixes the permissions of PID 1's STDIO
 2020-10-25 10:21:11 +08:00
Peng Tao
fba181088b Merge pull request #1021 from Tim-Zhang/autogen-proto 
agent: Generate proto files programmatically
 2020-10-24 11:12:24 +08:00
LiYa'nan
f134b4a301 agent: Update build instructions 
Fix the instructions explaining how to build the agent from source now that make needs to be run to auto-generate some source files.

Fixes: #889

Signed-off-by: LiYa'nan <oliverliyn@gmail.com>
 2020-10-24 03:06:41 +00:00
Tim Zhang
9e9988df29 agent/protocols: Move agent.proto out of the mock folder of agent 
Because the repos have been merged and the agent repo will be removed in the future,
we do not need mock the file structure any more.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-23 15:19:35 +08:00
fupan.lfp
e90aa7b417 agent: fixes the permissions of PID 1's STDIO 
Fix the permissions of PID 1's STDIO within the container to
the specified user.

The ownership needs to match because it is created outside of the
container and needs to be localized.

Fixes: #1022

Signed-off-by: fupan.lfp <fupan.lfp@antfin.com>
 2020-10-23 11:06:53 +08:00
Tim Zhang
9cb4150777 agent/protocols: Fix copyright header checking 
Caused by: bb718ba1dd

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-22 16:17:24 +08:00
Tim Zhang
0d58d91959 agent/protocols: Stop generate agent proto files in the shellscript 
Because the job has been done by build.rs.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-22 16:12:21 +08:00
Tim Zhang
7559382b15 agent/protocols: Ignore generated files and remove these files from repo 
Files generated by build.rs does not need to be stored in repo.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-22 16:12:21 +08:00
Tim Zhang
fdc33fb7bf agent/protocols: Generate proto files programmatically 
Build proto with build.rs

Fixes: #1019

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-22 16:12:15 +08:00
bin liu
df4ce9fab7 ci: add cargo clippy for agent 
To run `cargo clippy`, this commit includes changes:

- add a new Makefile target to run `cargo clippy`
- move `make`/`make check` to last step to let a fast retrun if `fmt`/`clippy` failed

Fixes: #951

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 15:14:17 +08:00
bin liu
2e13878880 agent: clear match_like_matches_macro/vec_resize_to_zero warnings 
This commit fix these warnings for Rust v1.47.0:

- match_like_matches_macro
- vec_resize_to_zero

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 15:13:25 +08:00
bin liu
227edfdc9f agent: clear module_inception/type_complexity warnings 
To clear these two warnings, this commit did changes:

- add `#![allow(clippy::module_inception)]` to target files
- use type alias for tuple of `(MessageHeader, Vec<u8>)`

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 15:03:16 +08:00
bin liu
698d25b7ee agent: clear redundant_field_names clippy warning 
add `#![allow(clippy::redundant_field_names)]` can skip check
`protocols` package, and fix redundant_field_names in other
packages.

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 15:03:16 +08:00
bin liu
4dd9bd7aba agent: clear clippy len_zero warnings 
Use `.is_empty()` instead of `.len() == 0`, `.len() >0`
and `.len() != 0`

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 15:03:16 +08:00
bin liu
bf7dec5c4f agent: clear clippy warnings 
This commit clears clippy warings for agent package.

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 15:03:16 +08:00
bin liu
56f867ee74 rustjail: clear clippy warnings 
This commit clears clippy warings for rustjail package.

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 14:54:51 +08:00
bin liu
16757ad490 oci: clear clippy warnings 
This commit clears clippy warings for oci package.

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-21 14:54:51 +08:00
Tim Zhang
7159fc2eda agent: simplify ttrpc error construction 
Fixes: #975

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-19 13:50:30 +08:00
Fupan Li
cacb27fe4b Merge pull request #942 from Tim-Zhang/optimize-error-handling 
agent: Optimize error handling
 2020-10-16 09:15:22 +08:00
Julio Montes
238e4562e0 Merge pull request #965 from jodh-intel/2.0-dev-agent-fix-crashers 
agent: fix crashers if API requests empty
 2020-10-15 09:53:11 -05:00
Peng Tao
6612b0c4bf Merge pull request #953 from liubin/fix/952 
rustjail: add length check for uid_mappings in rootless euid mapping
 2020-10-15 20:42:09 +08:00
Tim Zhang
6ba294a11e agent: remove unwrap() for e.as_errno() 
Use `{:?}` to print `e.as_errno()` instead of using `{}`
to print `e.as_errno().unwrap().desc()`.

Avoid panic only caused by error's content.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 19:46:00 +08:00
Tim Zhang
e77482fe16 agent: Use ? instead of match when the error returns directly 
It's more clear and more readable.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 19:45:55 +08:00
Tim Zhang
47ff2fb9a0 agent: use anyhow context to attach context to Error instead of match 
Context is clearer than match for these situations.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 18:16:54 +08:00
Tim Zhang
2f690a2bb0 agent: remove useless match 
Remove useless match.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 18:16:54 +08:00
Tim Zhang
1d8def6663 agent: Use ok_or_else instead of match for Option -> Result 
Using ok_or is clearer than match.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 18:15:14 +08:00
James O. D. Hunt
8495306641 agent: Fix crasher if AddARPNeighbors request empty 
Check if the ARP neighbours specified in the `AddARPNeighbors` API is
set before using it to avoid crashing the agent.

Fixes: #955.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
 2020-10-15 11:12:40 +01:00
James O. D. Hunt
3d084c7d23 agent: Fix crasher if UpdateRoutes request empty 
Check if the routes specified in the `UpdateRoutes` API is set before
using it to avoid crashing the agent.

Fixes: #949.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
 2020-10-15 11:12:38 +01:00
James O. D. Hunt
5615e5a7fe agent: Fix crasher if UpdateInterface request empty 
Check if the interface specified in the `UpdateInterface` API is set
before using it to avoid crashing the agent.

Fixes: #950.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
 2020-10-15 11:12:35 +01:00
Tim Zhang
0dce817ebb agent: replace match Result with or_else 
`or_else` is suitable for more complicated situations.
We can use it to return Ok in Err handling.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:58:51 +08:00
Tim Zhang
7bf4073d8d agent: replace unnecessary match Result with map_err 
Replace `match Result` whose Ok hand is useless.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:58:43 +08:00
Tim Zhang
7f9e5913e0 agent: replace check! with map_err for readability 
It's ambiguous and not easy to read to call method use macro.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:37:33 +08:00
Tim Zhang
09aca49ed7 agent: remove check! in child process because we cant' see logs. 
The check macro will log the errors but the log in child process can't
be seen, just ignore it.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:33:16 +08:00
Tim Zhang
a18899f1a3 agent: refactor namespace::setup to optimize error handling 
- Replace the return value with anyhow::Result.
- Remove if let Err.
- Remove match.

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:28:20 +08:00
Tim Zhang
a3c64e5ce5 agent: replace if let Err with or_else 
Fixes #934

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:27:10 +08:00
Tim Zhang
6ffa8283f0 agent: replace if let Err with map_err 
Fixes #934

Signed-off-by: Tim Zhang <tim@hyper.sh>
 2020-10-15 17:26:40 +08:00
bin liu
863f918a2c rustjail: add length check for uid_mappings in rootless euid mapping 
This might be a copy miss, gid_mappings is checked twice, one should
be uid_mappings.

Fixes: #952

Signed-off-by: bin liu <bin@hyper.sh>
 2020-10-15 16:43:52 +08:00
Peng Tao
fc6468efdb agent: fix panic on malformed device resource in container update 
Somehow containerd is sending a malformed device in update API. While it
should not happen, we should not panic either.

Fixes: #946
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
 2020-10-14 13:27:23 +08:00
Fupan Li
25cdf2d728 Merge pull request #931 from dgibson/bug703 
Forward port device conflict fixes from Kata 1 / Go agent
 2020-10-13 15:59:17 +08:00