Commit Graph

11497 Commits

Author SHA1 Message Date
Samuel Karp
f3086f3f94
Merge pull request #7369 from fuweid/fuweid/remove-zuul 2022-09-05 13:38:43 -07:00
Wei Fu
f9166aa53e .zuul: remove the zuul because it is offline
The [Openlab][1] has deprecated zuul jobs. We don't see any active the
zuul jobs in PR. Remove it and we need to seek new solution for ARM64
CI test.

[1]: <https://github.com/theopenlab>

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-09-05 23:42:54 +08:00
Sebastiaan van Stijn
e041d1a2c1
integration: TestUpdateContainerResources_MemoryLimit: remove TODO comment
This comment was added in 09a0c9471b when the
Windows integration tests were enabled. The PR (microsoft/hcsshim#931) was
merged, and part of hcsshim v0.9.0, and support for resource limits on Windows
was added in 2bc77b8a28, so it looks like this
comment is no longer current.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-05 09:52:29 +02:00
Daniel Canter
3a2197f5fe metrics/cgroups/v1: Remove unused event parameter
The event parameter wasn't actually used when processing oom events,
likely because it's only ever available for reads.

Additionally clarify flush is for eventfds, and point to where the
buffer size of 8 is coming from.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-09-02 20:38:09 -07:00
Kazuyoshi Kato
edd59aa360
Merge pull request #7356 from estesp/lint-timeout
Update golangci-lint timeout to match config
2022-09-01 13:32:52 -07:00
Phil Estes
3d7a93fed8
Merge pull request #7345 from zouyee/red
delete redundent import alias and and type conversion
2022-09-01 16:03:08 -04:00
Phil Estes
bfb280fb35
Update golangci-lint timeout to match config
Our GitHub Actions CI timeout setting was different than the config
file; we are now getting somewhat regular timeouts on the Windows
linting jobs so this should solve that and give us room in case runs
start taking longer

Signed-off-by: Phil Estes <estesp@amazon.com>
2022-09-01 14:55:55 -04:00
Phil Estes
0f1a14a402
Merge pull request #7350 from kzys/timer-windows
Make checkContainerTimestamps less strict on Windows
2022-09-01 11:14:41 -04:00
Kazuyoshi Kato
407703f092 Make checkContainerTimestamps less strict on Windows
This assertion is flaky on Windows.
Because of Go, Windows' time.Now resolution is lower than Linux.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-31 17:37:57 +00:00
zounengren
344b25995b delete redundent import alias and and type conversion
Signed-off-by: zounengren <zouyee1989@gmail.com>
2022-08-31 21:36:24 +08:00
Samuel Karp
1bb39b833e
Merge pull request #7346 from kzys/fuzz-enable 2022-08-30 22:33:43 -07:00
Samuel Karp
f6348684c8
Merge pull request #7326 from pacoxu/patch-4 2022-08-30 21:59:42 -07:00
Fu Wei
3b569fabeb
Merge pull request #7335 from thaJeztah/move_sys_forceremoveall 2022-08-31 07:35:36 +08:00
Phil Estes
73450fe8f0
Merge pull request #7338 from Abirdcfly/main
chore: remove duplicate word in comments
2022-08-30 15:50:12 -04:00
Kazuyoshi Kato
17e436c20c Pin github.com/AdamKorcz/go-118-fuzz-build
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-30 17:39:45 +00:00
Kazuyoshi Kato
a3bfa58b00 Make oss-fuzz mandatory
It has been disabled since some fuzzers were coming from
cncf/cncf-fuzzing repository and keeping them up-to-date was difficult.

However, the external repository is no longer used from oss-fuzz since
https://github.com/google/oss-fuzz/pull/8360.

As like other unit/integration tests, we should maintain the fuzzers in
this repository and fix any failures.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-08-30 16:32:46 +00:00
Phil Estes
455127859b
Merge pull request #7342 from tklauser/losetup-unix
Use ioctl helpers from x/sys/unix
2022-08-30 12:32:20 -04:00
Kazuyoshi Kato
1d6d5b4102
Merge pull request #7344 from thaJeztah/archive_cleanup
archive: replace tarName() with filepath.ToSlash()
2022-08-30 09:18:18 -07:00
Sebastiaan van Stijn
2e677c9329
sys: move ForceRemoveAll to integration/client
ForceRemoveAll was only used in tests/fuzzing, but added hcsshim as dependency
for the sys package. Moving this to integration/client makes the "sys" package
slightly more lightweight, and may help simplifying dependency-management.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-08-30 17:39:18 +02:00
Phil Estes
00114fe314
Merge pull request #7339 from thaJeztah/mount_deadcode
mount: remove unused ErrNotImplementOnWindows
2022-08-30 11:37:35 -04:00
Kazuyoshi Kato
4032aed178
Merge pull request #7334 from thaJeztah/sequential
replace sys Sequential funcs with moby/sys/sequential
2022-08-30 07:20:22 -07:00
Sebastiaan van Stijn
19db697a5a
archive: replace tarName() with filepath.ToSlash()
This code was copied from github.com/moby/moby/pkg/archive;
28842d3f09,
which got later simplified in
a5aed699cf

This patch aligns the containerd implementation with those changes, and uses
filepath.ToSlash() unconditionally on all platforms, as it's a no-op on platforms
that use a forward-slash; https://github.com/golang/go/blob/go1.19/src/path/filepath/path.go#L175-L183

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-08-30 15:19:58 +02:00
Tobias Klauser
3cc3d8a560
mount: use ioctl helpers from x/sys/unix
Use the IoctlRetInt, IoctlSetInt and IoctlLoopSetStatus64 helper
functions defined in the golang.org/x/sys/unix package instead of
manually wrapping these using a locally defined ioctl function.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2022-08-30 10:38:29 +02:00
Tobias Klauser
0c6553bfda
go.mod, vendor: bump golang.org/x/sys to latest version
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2022-08-30 10:38:20 +02:00
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