Commit Graph

13325 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
6142a2a24a
sys: remove unused GetOpenFds()
This was no longer used since 058eea362a
(v1.0.0-alpha0), and there's no external users.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:27:21 +01:00
Sebastiaan van Stijn
f0ce2f6d36
remotes/docker: remove deprecated NewAuthorizer alias
This was deprecated since containerd v1.3.0.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:27:21 +01:00
Sebastiaan van Stijn
c71a311561
sys: remove aliases for deprecated EpollCreate1, EpollCtl, EpollWait
These have been deprecated since containerd v1.4.0.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:27:20 +01:00
Sebastiaan van Stijn
3e5b444ac4
pkg/cri/util/: remove deprecated NormalizeImageRef alias
Has been deprecated in containerd v1.3.0, so we can remove this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:27:20 +01:00
Sebastiaan van Stijn
3a7cfaebbd
sys: remove alias for deprecated sys.RunningInUserNS()
The alias is in the 1.6 release, which should give consumers time
to migrate.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:27:19 +01:00
Sebastiaan van Stijn
bd912bbee0
go.mod: github.com/matttproud/golang_protobuf_extensions v1.0.2
Same commit, but now tagged

diff: https://github.com/matttproud/golang_protobuf_extensions/compare/c182affec369...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:21:42 +01:00
Sebastiaan van Stijn
5f23daeb26
go.mod: github.com/moby/sys/sequential v0.5.0
Same commit, but now tagged

diff: https://github.com/moby/sys/compare/b22ba8a69b30...sequential/v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:20:47 +01:00
Sebastiaan van Stijn
763ec7c862
go.mod: github.com/cpuguy83/go-md2man/v2 v2.0.2
it's an indirect dependency, but updating allows us to drop another
dependency.

full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.0...v2.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 22:19:43 +01:00
Sebastiaan van Stijn
0f616e3549
go.mod: github.com/AdaLogics/go-fuzz-headers v0.0.0-20221118232415-3345c89a7c72
full diff: 443f56ff4b...3345c89a7c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 21:59:44 +01:00
Sebastiaan van Stijn
df4d07352d
go.mod: golang.org/x/sys v0.2.0
full diff: https://github.com/golang/sys/compare/v0.1.0...v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 21:58:02 +01:00
Sebastiaan van Stijn
4e68634ef0
go.mod: github.com/sirupsen/logrus v1.9.0
full diff: https://github.com/sirupsen/logrus/compare/v1.8.1...v1.9.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-20 21:53:29 +01:00
Akihiro Suda
b9f79d3018
Merge pull request #7703 from yanggangtony/fsnotify
Fsnotify bump and change code
2022-11-20 19:50:54 +09:00
Fu Wei
c1c81857bf
Merge pull request #7683 from yanggangtony/build-md
fix build containerd in centos9
2022-11-20 13:12:27 +08:00
Phil Estes
9b0c83eda6
Merge pull request #7701 from yanggangtony/bumo-urfave-cli
Bump urfave-cli to v1.22.10
2022-11-19 21:35:18 -05:00
yanggang
579c7f43de
Change fsnotify event status condition.
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-20 09:43:54 +08:00
yanggang
2cea525eee
Bump fsnotify to v1.6.0
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-20 09:37:37 +08:00
yanggang
73c6db881b
Bump urfave-cli to v1.22.10
Signed-off-by: yanggang <gang.yang@daocloud.io>
2022-11-19 15:13:27 +08:00
guodong
bf777a70b1 remove duplicated tx rollback
Signed-off-by: guodong <guodong9211@gmail.com>
2022-11-19 13:57:55 +08:00
Fu Wei
8e787543de
Merge pull request #7685 from sofat1989/mainrunserially
can set up the network serially by CNI plugins
2022-11-19 12:33:40 +08:00
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