Commit Graph

11956 Commits

Author SHA1 Message Date
Phil Estes
0b81378be6
Merge pull request #8025 from fuweid/enhance-testlog
log/logtest: add `testcase` as debug field
2023-01-30 11:40:15 -05:00
Akihiro Suda
b5bdd6c7f2
Merge pull request #8027 from AkihiroSuda/containerd-cgroups-v3
go.mod: github.com/containerd/cgroups/v3 v3.0.0
2023-01-30 23:06:47 +09:00
Fu Wei
c3e236182b
Merge pull request #7977 from adisky/update-cni-version
Update CNI plugins to 1.2.0
2023-01-30 21:39:10 +08:00
Aditi
7ec75b1207 Update CNI to 1.2.0
Signed-off-by: Aditi <sharmaad@vmware.com>
2023-01-30 10:25:37 +00:00
Samuel Karp
3695f29c3c
Merge pull request #8026 from AkihiroSuda/otel-1.12.0 2023-01-29 22:16:59 -08:00
Fu Wei
f0f6912a8f
Merge pull request #8007 from mxpv/events
Move PLEG events for pause container under podsandbox package
2023-01-30 14:16:14 +08:00
Fu Wei
5d482fdd6b
Merge pull request #8012 from dcantah/runtime-clarifications
runtime docs: Clarify delete cwd behavior
2023-01-30 14:06:32 +08:00
Akihiro Suda
306db3e707
go.mod: github.com/containerd/cgroups/v3 v3.0.0
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-30 11:57:46 +09:00
Fu Wei
9857b5d1bb
Merge pull request #8019 from AkihiroSuda/add-cri-containerd-deprecated
release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles
2023-01-30 10:20:57 +08:00
Akihiro Suda
5082fb3958
go.mod: go.opentelemetry.io/otel v1.12.0
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-30 08:40:46 +09:00
Akihiro Suda
967979efdc
Merge pull request #8022 from fuweid/update-release
RELEASES.md: update release status
2023-01-29 23:58:36 +09:00
Fu Wei
aef75c4183
Merge pull request #8023 from fuweid/fix-7965
deflake: TestContainerPids
2023-01-29 19:00:09 +08:00
Wei Fu
8886b05dc3 integration: use sleep inf with busybox:1.36
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 18:02:18 +08:00
Wei Fu
005d30e849 deflake: TestContainerPids
It is kind of race because `sleep 1s` is short live process.

See: https://github.com/containerd/containerd/issues/7965#issuecomment-1383218025
Fixes: #7965

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 16:51:52 +08:00
Samuel Karp
fbf145b312
Merge pull request #8021 from AkihiroSuda/release-ubuntu-20.04
Fix https://github.com/containerd/containerd/issues/7961
2023-01-28 23:45:15 -08:00
Wei Fu
6de94a4cc1 log/logtest: add testcase as debug field
It is hard to tell where the `log_hook` log comes from, when we run test
parallelly. Add test name as field as debug purpose.

```
log_hook.go:47: time="2023-01-29T13:09:37.687070239+08:00" level=debug msg=fetch func=remotes.Fetch file="/home/fuwei/go/src/github.com/containerd/containerd/remotes/handlers.go:114" digest="sha256:ea362f368469f909a95f9a6e54ebe0121ce0a8e3c30583dd9c5fb35b14544dec" mediatype=application/vnd.docker.image.rootfs.diff.tar.gzip size=28566425 testcase=TestCRIImagePullTimeout/NoDataTransferred
```

REF: #8024

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 13:09:55 +08:00
Wei Fu
97ddac539e RELEASES.md: update release status
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 11:46:33 +08:00
Akihiro Suda
b36b415526
cri: mkdir /etc/cni with 0755, not 0700
/etc/cni has to be readable for non-root users (0755), because /etc/cni/tuning/allowlist.conf is used for rootless mode too.
This file was introduced in CNI plugins 1.2.0 (containernetworking/plugins PR 693), and its path is hard-coded.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-29 07:49:36 +09:00
Akihiro Suda
7eb6528302
release: Ubuntu 18.04 -> 20.04 (glibc 2.27 -> 2.31)
Ubuntu 18.04 will reach its End of Standard Support in April 2023:
https://wiki.ubuntu.com/Releases

By updating Ubuntu from 18.04 to 20.04, the dynamically-linked glibc
version is bumped up from 2.27 to 2.31.
The dynamically linked containerd binary still seems to be compatible with
CentOS 7 (glibc 2.17).

The runc binary in the `cri-containerd(-cni)-<VERSION>-linux-<ARCH>.tar.gz`
bundle no longer works on CentOS 7, though, but this is acceptable, as the
`cri-containerd(-cni)` bundle has been deprecated since containerd 1.6.

```
$ ldd /usr/local/sbin/runc
        linux-vdso.so.1 =>  (0x00007fffee9c4000)
        libpthread.so.0 => /lib64/libpthread.so.0 (0x00007eff48721000)
        libseccomp.so.2 => /lib64/libseccomp.so.2 (0x00007eff484e0000)
        libc.so.6 => /lib64/libc.so.6 (0x00007eff48112000)
        /lib64/ld-linux-x86-64.so.2 (0x00007eff492cb000)
$ /usr/local/sbin/runc
/usr/local/sbin/runc: symbol lookup error: /usr/local/sbin/runc: undefined symbol: seccomp_notify_respond
```

Fix issue 7961

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-29 07:42:13 +09:00
Akihiro Suda
b473c2922f
release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-29 03:32:15 +09:00
Derek McGowan
accb53cab4
Merge pull request #8015 from dmcgowan/update-1.5-eol
Update the EOL date for 1.5 release
2023-01-28 09:59:30 -08:00
Derek McGowan
b8962099e7
Merge pull request #8014 from dmcgowan/prepare-1.7.0-beta.3
Prepare release notes for v1.7.0-beta.3
2023-01-27 22:35:21 -08:00
Derek McGowan
d00655092e
Update the EOL date for 1.5 release
Update the release date to better coincide with Kubernetes 1.23 end
of life and the containerd 1.7 release.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-01-27 17:48:47 -08:00
Derek McGowan
336c0cd2c5
Prepare release notes for v1.7.0-beta.3
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-01-27 17:19:31 -08:00
Mohit Sharma
77e51e9b03 Adding support to run hcsshim from local clone
Signed-off-by: Mohit Sharma <mohit94614@gmail.com>
2023-01-27 16:57:31 +05:30
Anthony Nandaa
27cf7f87db
fix(docs): minor fix on the windows installation steps
`*` was left out and therefore the `/bin` directory is also copied over, while the following commands assume the files are copied to `containerd`

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
2023-01-27 09:54:04 +03:00
Danny Canter
d215786741 runtime docs: Clarify delete cwd behavior
Noticed the cwd behavior noted for Windows also applies to FreeBSD now.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-01-26 18:38:25 -08:00
Edgar Lee
34d5878185 Use mount.Target to specify subdirectory of rootfs mount
- Add Target to mount.Mount.
- Add UnmountMounts to unmount a list of mounts in reverse order.
- Add UnmountRecursive to unmount deepest mount first for a given target, using
moby/sys/mountinfo.

Signed-off-by: Edgar Lee <edgarhinshunlee@gmail.com>
2023-01-27 09:51:58 +08:00
Kazuyoshi Kato
753bfd6575
Merge pull request #7959 from Jenkins-J/fix-mem-limit-test
Fix Memory Limit test
2023-01-26 10:33:35 -08:00
Maksym Pavlenko
21fe0ceaad Move PLEG events for pause container to podsandbox
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-01-25 19:28:48 -08:00
Maksym Pavlenko
93a2823811
Merge pull request #8005 from my-git9/chore/reuseerrdefs
Reused package errdefs for not supported error
2023-01-25 09:56:06 -08:00
xin.li
12359559d1 reused package errdefs for not supported err
Signed-off-by: xin.li <xin.li@daocloud.io>
2023-01-25 23:22:57 +08:00
Derek McGowan
8d9af708d7
Merge pull request #7994 from thaJeztah/re_fix_vec_aloc
pkg/cri: optimize slice initialization
2023-01-24 13:05:25 -08:00
Sebastiaan van Stijn
4f39b164f3
pkg/cri: optimize slice initialization
Some of this code was originally added in b7b1200dd3,
which likely meant to initialize the slice with a length to reduce allocations,
however, instead of initializing with a zero-length and a capacity, it
initialized the slice with a fixed length, which was corrected in commit
0c63c42f81.

This patch initializes the slice with a zero-length and expected capacity.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-01-24 20:46:20 +01:00
Kazuyoshi Kato
403352dd3d
Merge pull request #7987 from marquiz/devel/goresctrl
go.mod: update goresctrl to v0.3.0
2023-01-24 10:31:49 -08:00
Derek McGowan
c8736471a9
Merge pull request #7985 from jedevc/fix-push-error-propagate
pushWriter: correctly propagate errors
2023-01-24 10:30:01 -08:00
Justin Chadwell
9f6058d029 pushWriter: correctly propagate errors
In the refactor from 926b9c72f61b5be6bf8d952512f1d0932fbaf898, the error
handling was substantially reworked, and changed the types of errors
returned.

Notably, in the case of a network error, instead of propogating the
error through to return from pushWriter.Write (as previously), it would
be propagated through to pushWriter.Commit - however, this is too late,
since we've already closed the io.Pipe by the time we would have reached
this function. Therefore, we get the generic error message  "io:
read/write on closed pipe" for *every network error*.

This patch corrects this behavior to ensure that the correct error
object is always returned as early as possible, by checking the error
result after writing and detecting a closed pipe.

Additionally, we do some additional hardening - specifically we prevent
falling through when resetting the content or detecting errors, and
update the tests to explicitly check for the ErrReset message.

Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-01-24 11:37:41 +00:00
Markus Lehtonen
3612915596 Update vendored files
Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
2023-01-24 11:34:44 +02:00
Markus Lehtonen
d845b2a9c2 go.mod: update goresctrl to v0.3.0
Update github.com/intel/goresctrl to v0.3.0 which ontains multiple
bugfixes to rdt support.

Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
2023-01-24 11:34:33 +02:00
Phil Estes
3f565daf68
Merge pull request #7968 from AkihiroSuda/ci-test-release
CI: test release.yml on every PR
2023-01-20 08:03:27 -05:00
Derek McGowan
beabd3d5d1
Merge pull request #7129 from junnplus/namespace-service
fix incorrect namespace of event when create/update namespace
2023-01-19 22:49:28 -08:00
Phil Estes
dadd203c25
Merge pull request #7973 from mxpv/backport
Backport changes to sandboxed CRI
2023-01-18 11:52:44 -05:00
Phil Estes
d45134639f
Merge pull request #7970 from Fish-pro/fix/statemant
Fix syntax errors in the document
2023-01-18 11:21:56 -05:00
Fish-pro
ac72483e87 Fix syntax errors in the document
Signed-off-by: Fish-pro <zechun.chen@daocloud.io>
2023-01-18 09:59:41 +08:00
Maksym Pavlenko
f9f8455332 Backport #7393 to sbserver
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-01-17 14:36:21 -08:00
Maksym Pavlenko
0cbfb3375f Backport #7661 to sbserver
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-01-17 14:31:47 -08:00
Maksym Pavlenko
41eabf134a Backport #7685 to sbserver
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-01-17 14:26:16 -08:00
Maksym Pavlenko
b0d7a96976 Backport unit test from #7882 to sbserver
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-01-17 14:26:16 -08:00
James Jenkins
b1c5c57be0 Fix Memory Limit test
Modify the memory limit test, allowing the test to pass when swap is not
enabled.

Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
2023-01-17 13:07:28 -05:00
Phil Estes
62ffbb4b73
Merge pull request #7969 from AkihiroSuda/release-debian-frontend-noninteractive
release/Dockerfile: set DEBIAN_FRONTEND=noninteractive
2023-01-17 11:48:16 -05:00