Commit Graph

13325 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
93342d637c
replace sys Sequential funcs with moby/sys/sequential
These functions were originally copied from the docker / moby repository in
4a7a8efc2d. Migrating these functions to use the
github.com/moby/sys/sequential module allows them being shared between moby,
docker/cli, and containerd, and to allow using them without importing all of sys
which also depends on hcsshim and more.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-08-29 18:36:34 +02:00
Sebastiaan van Stijn
9ae2cc3a8a
mount: remove unused ErrNotImplementOnWindows
This error was added in c5843b7615, but no longer
used since a5a9f91832, which implemented Windows
support.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-08-29 10:55:04 +02:00
Abirdcfly
dcfaa30ba2 chore: remove duplicate word in comments
Signed-off-by: Abirdcfly Fu <fp544037857@gmail.com>
2022-08-29 13:05:32 +08:00
Paco Xu
b170eb3cac Add Kubernetes v1.25 supported version as v1.24
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
2022-08-27 09:39:58 +08:00
Kazuyoshi Kato
bf8cdc2918
Merge pull request #7324 from jterry75/jterry75/clarify_k8s
Clarify containerd 1.5.0+ for k8s 1.20,1.21
2022-08-26 11:51:11 -07:00
Phil Estes
91b9e5a00d
Merge pull request #7315 from AkihiroSuda/runc-1.1.4
update runc binary to v1.1.4
2022-08-26 09:39:59 -04:00
Fu Wei
0e7ff59098
Merge pull request #7325 from kzys/upgrade-compress 2022-08-26 21:23:00 +08:00
Phil Estes
827b3a103f
Merge pull request #7287 from zouyee/cri-25
Update k8s.io/cri-api to v0.25.0
2022-08-26 08:55:38 -04:00
bin liu
fdff11def3 ctr: add privileged-without-host-devices for run command
For Kata Containers, starting a privileged container will fail
if passing all host devices to container due to the permission
issue, like the `privileged_without_host_devices` for CRI service,
add a `privileged-without-host-devices` to `ctr run` command will
disable passing all host devices to containers.

Signed-off-by: bin liu <liubin0329@gmail.com>
2022-08-26 15:56:01 +08:00
Kazuyoshi Kato
d063597e80 Upgrade github.com/klauspost/compress from v1.11.13 to v1.15.9
The package has multiple improvements and bug fixes.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-25 22:58:16 +00:00
Akihiro Suda
eb664aed0c
go.mod: github.com/opencontainers/runc v1.1.4
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-08-26 07:51:16 +09:00
Akihiro Suda
ad597015cd
update runc binary to v1.1.4
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-08-26 07:51:11 +09:00
Justin Terry
962841fc7e Clarify containerd 1.5.0+ for k8s 1.20,1.21
Signed-off-by: Justin Terry <jlterry@amazon.com>
2022-08-25 13:16:28 -07:00
Samuel Karp
765351ac4d
Merge pull request #7322 from fuweid/ci-cleanup 2022-08-25 10:14:59 -07:00
Wei Fu
90f6bd21c3 script/setup: handle cnidir with SUDO
The dir related to CNI should be handled with sudo if EUID != 0.

Follow-up: 8add7e5d39

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-25 23:16:22 +08:00
zounengren
331066f87d update intergration
Signed-off-by: zounengren <zouyee1989@gmail.com>
2022-08-25 21:17:59 +08:00
zounengren
49e2fe2abb bump cri-api
Signed-off-by: zounengren <zouyee1989@gmail.com>
2022-08-25 21:03:55 +08:00
Samuel Karp
36d0cfd0fd
Merge pull request #6517 from ruiwen-zhao/return-resource 2022-08-24 14:01:30 -07:00
Samuel Karp
8ce32aedd8
Merge pull request #7038 from pacoxu/registry-change 2022-08-24 13:04:13 -07:00
ruiwen-zhao
b7b1200dd3 ContainerStatus to return container resources
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
2022-08-24 19:08:06 +00:00
Kazuyoshi Kato
d0c99ff5f1
Merge pull request #7309 from kzys/fuzz-no-rename
Do not rename test files on-the-fly to share functions
2022-08-24 10:30:04 -07:00
Paco Xu
9525b3148a migrate from k8s.gcr.io to registry.k8s.io
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
2022-08-24 13:46:46 +08:00
Samuel Karp
542e4b219d
Merge pull request #6906 from ginglis13/6441-ctr-import 2022-08-23 17:35:40 -07:00
Daniel Canter
f0036cb9dc windows: Add runhcs-wcow-hypervisor runtimeclass to the default config
As part of the effort of getting hypervisor isolated windows container
support working for the CRI entrypoint here, add the runhcs-wcow-hypervisor
handler for the default config. This sets the correct SandboxIsolation
value that the Windows shim uses to differentiate process vs. hypervisor
isolation. This change additionally sets the wcow-process runtime to
passthrough io.microsoft.container* annotations and the hypervisor runtime
to accept io.microsoft.virtualmachine* annotations.

Note that for K8s users this runtime handler will need to be configured by
creating the corresponding RuntimeClass resources on the cluster as it's
not the default runtime.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-19 07:56:43 -07:00
Samuel Karp
f4a905109b
Merge pull request #7308 from dcantah/rm-mingw-downgrade 2022-08-18 22:49:06 -07:00
Kazuyoshi Kato
f318947b06 Do not rename test files on-the-fly to share functions
Instead this commit moves some functions that could be used by fuzzers.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-19 03:48:18 +00:00
Daniel Canter
912d43b2bd Revert "Downgrade MinGW to version 10.2.0"
This reverts commit 1ef4bda433.

Previously we were downgrading mingw to work around an issue in the race
detector in Go on Windows when used with a newer version of GCC. The
issue was first reported here:

golang/go#46099

Shortly after the release of 1.19 someone had commented this issue was
solved for them, and after trying it out in some test runs on actions
machines, it seems to be the case. Disabling ASLR got things in order, and
PIE was disabled for -race builds in 1.19, so this is likely the reason
things work now:
0c7fcf6bd1.

The downgrade was mostly harmless except for two shortcomings:

1. It took quite a while for the package to get downloaded+installed.

2. Chocolatey would frequently fail to download with `The remote file
either doesn't exist, is unauthorized, or is forbidden for url ...
Exception calling "GetResponse" with "0" argument(s): "The request
was aborted: Could not create SSL/TLS secure channel."` Restarting the
failed run would often resolve this, but a 50-50 shot of things working
is not a great situation.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-18 15:18:49 -07:00
Phil Estes
49a945b26b
Merge pull request #7286 from fuweid/follow-up-7254
Follow up #7254 (Switch to Go 1.19)
2022-08-18 10:35:43 -04:00
Phil Estes
4e37eb3329
Merge pull request #7304 from kzys/upgrade-cgroups
Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer
2022-08-18 10:31:34 -04:00
Fu Wei
7c43483601
Merge pull request #7301 from henry118/bpfcap
Adding support of CAP_BPF and CAP_PERFMON
2022-08-18 18:36:38 +08:00
Wei Fu
850f667f57 contrib/fuzz/daemon.go: reformat the fileheader
Align with
https://github.com/containerd/project/blob/main/script/validate/template/go.txt.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-18 07:42:13 +08:00
Wei Fu
460b0533b2 pkg/cri/streaming: increase ReadHeaderTimeout
It is follow-up of #7254. This commit will increase ReadHeaderTimeout
from 3s to 30m, which prevent from unexpected timeout when the node is
running with high-load. 30 Minutes is longer enough to get close to
before what #7254 changes.

And ideally, we should allow user to configure the streaming server if
the users want this feature.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-18 07:42:12 +08:00
Kazuyoshi Kato
9d286baedf crypto/sha256 must be imported
Otherwise, go-digest panics (panic: sha256 not available).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-17 21:43:47 +00:00
Kazuyoshi Kato
adc7d5b2e9 Don't patch github.com/cilium/ebpf
The package doesn't have the file anymore.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-17 21:43:47 +00:00
Kazuyoshi Kato
470d3ee057 Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer
The fuzzer is broken and it breaks OSS-Fuzz according to #7288.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-17 21:43:45 +00:00
Kevin Parsons
f0e1a27cbd
Merge pull request #7284 from dcantah/hcsshim-bump-0.10
go.mod: Bump hcsshim to v0.10.0-rc.1
2022-08-17 13:12:42 -07:00
Henry Wang
43907515b4 adding support of CAP_BPF and CAP_PERFMON
Signed-off-by: Henry Wang <henwang@amazon.com>
2022-08-17 19:59:09 +00:00
Samuel Karp
0fd000f59c
Merge pull request #7306 from chaodaiG/fix-bash-bug 2022-08-17 12:00:33 -07:00
Chao Dai
13b14736a8 Don't fail test when GOOGLE_APPLICATION_CREDENTIALS is unset
Workload identity is preferred in CI instead of GOOGLE_APPLICATION_CREDENTIALS

Signed-off-by: Chao Dai <chaodai@google.com>
2022-08-17 11:51:38 -07:00
Daniel Canter
0950447106 Remove Windows special case in TestContainerdRestart
Previously in the Windows shim, killing a task that has already exited
or a task that has not yet been started, yielded an ErrNotFound. We now
return nil, which is in line with how the linux runtime behaves, so remove
the special case we had in TestContainerdRestart for this.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-15 17:03:45 -07:00
Daniel Canter
1f8db2467b go.mod: Bump hcsshim to v0.10.0-rc.1
This contains quite a bit (also bumps google/uuid to 1.3.0). Some HostProcess
container improvements to get ready for whenever it goes to stable in
Kubernetes, Hyper-V (windows) container support for CRI, and a plethora of
other small additions and fixes.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-15 17:03:45 -07:00
Samuel Karp
a04268132e
Merge pull request #7293 from samuelkarp/ci-workflow-goproxy 2022-08-15 16:50:18 -07:00
Samuel Karp
396d2a7e4e
ci: remove GOPROXY environment variable due to https://github.com/go-yaml/yaml/issues/887
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2022-08-15 13:00:49 -07:00
Fu Wei
6699403403
Merge pull request #7280 from mxpv/runtime
Runtime cleanup (Shim manager and task service)
2022-08-13 17:20:16 +08:00
Maksym Pavlenko
1d8b1bc75b Cleanup shim manager
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-11 21:41:32 -07:00
Samuel Karp
f87a1b09fe
Merge pull request #6931 from egernst/cri-stress 2022-08-10 17:59:48 -07:00
Maksym Pavlenko
ff65fc2d0e Make TaskList generic
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-10 14:02:53 -07:00
Maksym Pavlenko
23f66ece59
Merge pull request #7254 from mxpv/go
Switch to Go 1.19
2022-08-10 12:12:49 -07:00
ruiwen-zhao
6e4b6830f1 Update CRI-API
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
2022-08-10 03:55:51 +00:00
Akihiro Suda
4902059cb5
Merge pull request #7265 from fuweid/dump-containerd-log-after-finish
Vagrantfile: dump containerd log after critest
2022-08-07 22:45:21 +09:00