Commit Graph

11956 Commits

Author SHA1 Message Date
yanggang
70b65062c7
Missed out platform interface when reused the conn for Client.
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-19 11:01:19 +08:00
Changwei Ge
176e8d35ce image/label: print more characters of label keys
Like stargz and nydus remote snapshotter, some snapshots
lables are introduced and passed to snapshotter from containerd
automatically. The label keys' length are all longer than 10.

The limitation of 10 characters makes it harder to debug what label
is not appropriate. So we'd better to print more of the wrong label.

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
2022-11-19 09:40:02 +08:00
Qasim Sarfraz
0c4d32c131 cri: add pod uid annotation
Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
2022-11-19 01:12:02 +01:00
Samuel Karp
58180661eb
Merge pull request #7656 from ruiwen-zhao/removeAlpha 2022-11-18 15:23:57 -08:00
yanggang
438db09b07
Fix building.md for btrfs
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-19 06:52:42 +08:00
ruiwen-zhao
792294ce06 Update to cri-api v0.26.0-beta.0
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
2022-11-18 21:13:34 +00:00
ruiwen-zhao
234bf990dc Copy cri-api v1alpha2 from v0.25.4 to containerd internal directory
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
2022-11-18 21:09:43 +00:00
Maksym Pavlenko
a30e1bb081
Merge pull request #7696 from dcantah/unused-arg
overlay: Remove unused method param
2022-11-18 10:56:16 -08:00
Juan Hoyos
e224f77eb7 Add process_vm read and write calls to default seccomp profile
Follow up to 94faa70df4. The commit referenced allowed `ptrace` calls in the default seccomp profile following the usual tracing security checks in for Kernels newer than 4.8. Kernels prior to this version are susceptible to [CVE-2019-2054](https://github.com/advisories/GHSA-qgfr-27qf-f323).  Moby's default had allowed for `ptrace` for kernels newer than 4.8 at the time the commit was created. The current [seccomp default](https://github.com/moby/moby/blob/master/profiles/seccomp/default_linux.go#L405-L417) has been updated to include `process_vm_read` and `process_vm_write`. Mirror that policy to complete the classic ptrace set of APIs.

Signed-off-by: Juan Hoyos <juan.s.hoyos@outlook.com>
2022-11-18 10:51:45 -05:00
Phil Estes
ff8094961c
Merge pull request #7691 from AkihiroSuda/fedora37
CI: update Fedora to 37
2022-11-18 10:34:50 -05:00
Danny Canter
e4130b2a02 overlay: Remove unused method param
`getCleanupDirectories` didn't use the storage transactor.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2022-11-18 03:04:32 -08:00
Akihiro Suda
661aaae3bb
introspection: expose the daemon's PID and PIDNS
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-11-18 17:14:26 +09:00
Samuel Karp
b9db5673f4
Merge pull request #7678 from jellor/tx-rollback 2022-11-17 23:24:06 -08:00
Fei Su
f6232793b4 can set up the network serially by CNI plugins
Signed-off-by: Fei Su <sofat1989@126.com>
2022-11-18 15:19:00 +08:00
Derek McGowan
223f67ccdb
Merge pull request #7601 from kzys/cgroups-upgrade
Upgrade github.com/containerd/cgroups from v1 to v3
2022-11-17 21:55:03 -08:00
Derek McGowan
6e0f1bbad9
Merge pull request #7675 from mxpv/deps
Remove OpenTelementry imports from remotes/docker package
2022-11-17 17:17:48 -08:00
Akihiro Suda
2f5dd7c660
CI: update Fedora to 37
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-11-18 09:42:42 +09:00
Maksym Pavlenko
1a0ac21e20
Merge pull request #7686 from mxpv/shutdown
Expose Done and Err in Shutdown service
2022-11-17 16:17:30 -08:00
Fu Wei
c037f8c24c
Merge pull request #7688 from yanggangtony/gotestsum
gotestsum match go version 1.19
2022-11-17 22:50:35 +08:00
yanggang
3fc5802d11
gotestsum match go version 1.19
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-17 20:42:22 +08:00
Maksym Pavlenko
aaf59efd20 Expose Done and Err in Shutdown service
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-11-16 22:03:44 -08:00
Yasin Turan
5d0457df90 Refactored ctr to allow for tty allocation when container has {terminal:true} within Spec
Signed-off-by: Yasin Turan <turyasin@amazon.com>
2022-11-16 21:15:03 +00:00
Phil Estes
344da9edb2
Merge pull request #7670 from yanggangtony/fix-desc-for-containerd
complement sub-command note for containerd-main
2022-11-16 10:16:56 -05:00
guodong
c245347e96 tx rollback when GetInfo return error
Signed-off-by: guodong <guodong9211@gmail.com>
2022-11-16 23:04:26 +08:00
Maksym Pavlenko
14a08721cc Remove OpenTelementry imports from remotes/docker package
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-11-15 17:32:26 -08:00
Maksym Pavlenko
c85745ad78
Merge pull request #7668 from yanggangtony/code-clean
keep the lower case letter for flag info
2022-11-15 16:05:04 -08:00
Kazuyoshi Kato
8881873291
Merge pull request #7666 from fuweid/deflake-ci-issue-7264
bump critools into ca1571e6edd116b2c95f52e3dfa0b4779b74223a
2022-11-15 09:29:58 -08:00
yanggang
405024db0a
complement sub-command note for containerd-main
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-15 17:04:02 +08:00
yanggang
e38e2c8a4d
make status more readable and update easy.
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-15 15:48:01 +08:00
yanggang
3abcfb5c07
keep the lower case letter for flag info
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-15 14:09:55 +08:00
Samuel Karp
79a0b1ae7b
Merge pull request #7667 from aman556/fix-broken-url-CRI
Fix broken link for CRI plugin in docs
2022-11-14 21:28:33 -08:00
Aman Sharma
69af001b3a Replace broken and redirection link for CRI and kubelet in docs
Signed-off-by: Aman Sharma <amansh@vmware.com>
2022-11-15 09:57:42 +05:30
Wei Fu
b0133882f5 bump critools into ca1571e6edd116b2c95f52e3dfa0b4779b74223a
It is to fix #7264 with kubernetes-sigs/cri-tools#1026. Currently, it
is not release tag but it can save our time to prevent from rerun CI manually.
There will be follow-up when kubernetes v1.26 releases.

REF: https://github.com/kubernetes/sig-release/tree/master/releases/release-1.26#summary

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-11-15 08:47:38 +08:00
Kazuyoshi Kato
1e200b149a
Merge pull request #7523 from ginglis13/symlink-device
add option to resolve symlinks in WithLinuxDevice
2022-11-14 16:32:46 -08:00
Kazuyoshi Kato
8bb5999738 Remove the outdated comment
While containerd/cgroups is only for Linux, the metrics subcommand works
on Windows.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-11-14 21:07:48 +00:00
Kazuyoshi Kato
dd86128e0d Convert hcsshim's stats to cgroups' stats
Since hcsshim still uses containerd/cgroups 1.x which uses
gogo/protobuf.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-11-14 21:07:48 +00:00
Kazuyoshi Kato
6596a70861 Use github.com/containerd/cgroups/v3 to remove gogo
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-11-14 21:07:48 +00:00
Kazuyoshi Kato
f1162b77a3
Merge pull request #7663 from lucacome/bump-k8s-deps
Bump k8s.io deps to v0.25.4
2022-11-14 12:09:56 -08:00
Phil Estes
af37da71e3
Merge pull request #7659 from AkihiroSuda/static-release
Release: add static binaries
2022-11-14 10:02:48 -05:00
Phil Estes
28d5f9c334
Merge pull request #7662 from lucacome/bump-otel-deps
Bump OpenTelemetry contrib to v0.36.4
2022-11-14 10:01:03 -05:00
Luca Comellini
38ad785cef
Bump k8s.io deps to v0.25.4
Signed-off-by: Luca Comellini <luca.com@gmail.com>
2022-11-11 15:13:35 -08:00
Luca Comellini
bd66f588bf
Bump OpenTelemetry contrib to v0.36.4
Signed-off-by: Luca Comellini <luca.com@gmail.com>
2022-11-11 15:10:38 -08:00
Akihiro Suda
3fca677c19
Release: add static binaries
Fix issue 7296

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-11-12 03:52:37 +09:00
Phil Estes
135af6d9ab
Merge pull request #7661 from liubin/fix-vec-alloc
Fix slice append error (`spec.Linux.Resources.HugepageLimits`)
2022-11-11 12:32:29 -05:00
bin liu
0c63c42f81 Fix slice append error
In golang when copy a slice, if the slice is initialized with a
desired length, then appending to it will cause the size double.

Signed-off-by: bin liu <liubin0329@gmail.com>
2022-11-12 00:22:04 +08:00
Phil Estes
0f401197c8
Merge pull request #7660 from lucacome/bump-otel-deps
Bump OpenTelemetry to v1.11.1
2022-11-11 10:22:33 -05:00
Luca Comellini
b829e6f2d3
Bump OpenTelemetry to v1.11.1
Signed-off-by: Luca Comellini <luca.com@gmail.com>
2022-11-10 22:15:10 -08:00
Fu Wei
f226fa895e
Merge pull request #5263 from pacoxu/add-metrics-scheduler
feature: add gc scheduler metrics collection count
2022-11-11 12:11:56 +08:00
Fu Wei
9fffa8c712
Merge pull request #7629 from wzshiming/feat/pprof-debug
Add `--debug` args to all subcommands of `ctr pprof`
2022-11-11 11:47:57 +08:00
Fu Wei
669230cbd6
Merge pull request #7655 from swagatbora90/tracing-refactor
Add a thin wrapper around otel Span object
2022-11-11 11:45:28 +08:00