github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,751 Commits 3 Branches 2 Tags 112 MiB
d33a43cc23
Commit Graph

11751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjorn Neergaard
d33a43cc23
pkg/apparmor: clarify Godoc 
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-02-10 10:23:59 -07:00
Bjorn Neergaard
a3265102d9
Revert "Don't check for apparmor_parser to be present" 
This reverts commit 1acca8bba3.

As stated in the Godoc, this function is intended to check for presence
of `apparmor_parser`. Changing this regressed the public API of
containerd, and directly contradicts the way that this function is
consumed inside of containerd itself:
* fdfdc9bfc0/pkg/apparmor/apparmor.go (L20)
* fdfdc9bfc0/pkg/cri/sbserver/helpers_linux.go (L85)
* fdfdc9bfc0/pkg/cri/server/helpers_linux.go (L144)

This has lead to a number of painful regressions and attempted fixes in
Moby:
* https://github.com/moby/moby/issues/44900
* https://github.com/moby/moby/pull/44902
* https://github.com/moby/moby/issues/44970

While reverting this late into the life of 1.6 and at the start of the
life of 1.7 is likely painful, I think this is ultimately the best path
to take, as containerd is subject to the same failure to start
containers with an AppArmor kernel when `apparmor_parser` is missing as
Moby.

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-02-10 10:05:56 -07:00
Derek McGowan
fdfdc9bfc0
Merge pull request #8082 from AkihiroSuda/ci-skip-on-fork 
CI: skip some jobs when `repo != containerd/containerd`
 2023-02-10 08:35:51 -08:00
Fu Wei
4c44ec702f
Merge pull request #8078 from Fish-pro/chore/package 2023-02-10 17:35:10 +08:00
Akihiro Suda
fe0116ec2a
CI: skip some jobs when repo != containerd/containerd 
For running CI in a non-upstream repo

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-02-10 18:12:08 +09:00
Zechun Chen
b944b108df Clean up repeated package import 
Signed-off-by: Zechun Chen <zechun.chen@daocloud.io>
 2023-02-10 16:21:55 +08:00
Fu Wei
218b1a335e
Merge pull request #8076 from cpuguy83/use_data_in_descriptor 
fetch: Use data from descriptor when available.
 2023-02-10 15:50:17 +08:00
Maksym Pavlenko
195eca1d6c
Merge pull request #8077 from Fish-pro/chore/httpvar 
chore: use http constants instead of string
 2023-02-09 23:32:17 -08:00
Derek McGowan
676b942fef
Merge pull request #8075 from swagatbora90/removeIntermediate 
Fix retry logic within devmapper device deactivation
 2023-02-09 22:21:49 -08:00
Fish-pro
76a62e52ae Use http constants instead of string 
Signed-off-by: Fish-pro <zechun.chen@daocloud.io>
 2023-02-10 14:01:48 +08:00
Akihiro Suda
a6f3cbe0ad
Merge pull request #8071 from mxpv/cleanup 
Clean CI yaml
 2023-02-10 11:34:18 +09:00
Brian Goff
13652e081e fetch: Use data from descriptor when available. 
OCI added support for a `data` field in a descriptor.
This field is expected to contain the content being pointed to by the
descriptor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2023-02-10 01:12:40 +00:00
Swagat Bora
6ae3e5df6a Fix retry logic within devmapper device deactivation 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2023-02-09 23:40:18 +00:00
Maksym Pavlenko
6adb6a727e Rename release CI job 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-09 15:30:52 -08:00
Maksym Pavlenko
aed3b0a70b Clean CI file 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-09 15:30:52 -08:00
Samuel Karp
26509fa765
Merge pull request #8074 from kzys/fix-8073 
Fixes https://github.com/containerd/containerd/issues/8073
 2023-02-09 15:28:32 -08:00
Kazuyoshi Kato
617c66dcc7 Add critest.exe in $PATH 
The binary location was moved since
https://github.com/kubernetes-sigs/cri-tools/pull/1085.

Fixes #8073.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2023-02-09 22:23:01 +00:00
Phil Estes
97480afdac
Merge pull request #7976 from yulng/lowercase 
keep the uppercase letter for flag info
 2023-02-07 09:54:38 +00:00
Fu Wei
20de989afc
Merge pull request #8049 from kiashok/updateShimTag 
go.mod: Bump hcsshim to v0.10.0-rc.5
 2023-02-06 22:24:33 +08:00
yulng
757b8f702b
keep the uppercase letter for flag info 
Signed-off-by: yulng <wei.yang@daocloud.io>
 2023-02-06 16:37:24 +08:00
Maksym Pavlenko
94934e1a47
Merge pull request #8045 from mxpv/sb 
Fix sandbox exit monitor
 2023-02-03 11:31:43 -08:00
Kirtana Ashok
e5c57f2422 update hcsshim tag to v0.10.0-rc.5 and revendor 
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
 2023-02-03 10:50:56 -08:00
Maksym Pavlenko
1f35b03369 Fix sandbox exit monitor 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 14:02:52 -08:00
Maksym Pavlenko
3d32da8f60
Merge pull request #7979 from mxpv/grpc 
Generate GRPC contracts for runtime APIs
 2023-02-02 11:49:32 -08:00
Maksym Pavlenko
d1cd9757eb Generate GRPC for runtime task service 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 09:58:43 -08:00
Maksym Pavlenko
86c238c873 Generate GRPC for runtime sandbox API 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 09:58:43 -08:00
Maksym Pavlenko
99580e0aad Update TTRPC and Protobuild dependencies 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2023-02-02 09:58:43 -08:00
Phil Estes
60363db5bc
Merge pull request #8035 from ktock/fixunmount 
Make argument validation of `mount.UnmountRecursive` compatible to `mount.UnmountAll`
 2023-02-02 11:55:24 -05:00
Phil Estes
6116820aeb
Merge pull request #8036 from ktock/remotesnlabel 
Export remote snapshotter label handler
 2023-02-02 11:53:43 -05:00
Fu Wei
6ed24c88ed
Merge pull request #7989 from mohitsharma-in/topic/directory-install-runhcs-shim 
Adding support to run install hcsshim from local clone
 2023-02-02 10:38:43 +08:00
Akihiro Suda
e6b515d463
Merge pull request #8040 from thaJeztah/update_urfave_cli 
go.mod: github.com/urfave/cli v1.22.12
 2023-02-02 08:26:05 +09:00
Phil Estes
eda079259d
Merge pull request #8039 from yankay/cleanup-useless-IntToInt32Array-func 
cmd/ctr/commands: clean up the func IntToInt32Array in utils.go
 2023-02-01 11:19:17 -05:00
Mohit Sharma
b9b44ed5c5 Removing end of line for last line 
Signed-off-by: Mohit Sharma <mohit94614@gmail.com>
 2023-02-01 20:44:23 +05:30
Kohei Tokunaga
dbf384a5a8 Export remote snapshotter label handler 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-02-01 23:03:23 +09:00
Sebastiaan van Stijn
d6070f8a74
go.mod: github.com/urfave/cli v1.22.12 
full diff: https://github.com/urfave/cli/compare/v1.22.10...v1.22.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-02-01 12:42:03 +01:00
Kay Yan
2f1aad03af
cleanup useless IntToInt32Array func 
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
 2023-02-01 12:14:46 +08:00
Phil Estes
0181b103ea
Merge pull request #8037 from AkihiroSuda/epoch-drop-timezone 
pkg/epoch: drop timezone
 2023-01-31 17:04:50 -05:00
Phil Estes
58ad67caee
Merge pull request #8034 from klihub/deps/update-nri 
go.mod: update github.com/containerd/nri.
 2023-01-31 17:03:57 -05:00
Phil Estes
d9d74c14b4
Merge pull request #8013 from profnandaa/patch-2 
fix(docs): minor fix on the windows installation steps
 2023-01-31 17:03:35 -05:00
Akihiro Suda
e551d734fb
pkg/epoch: drop timezone 
For determinism of human-readable string representation.
e.g., "2023-01-10T12:34:56Z" vs "2023-01-10T21:34:56+09:00"

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-01-31 23:26:02 +09:00
Kohei Tokunaga
eeab052425 Make mount.UnmountRecursive compatible to mount.UnmountAll 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2023-01-31 22:07:44 +09:00
Krisztian Litkey
58bd5a0940 go.mod: update github.com/containerd/nri. 
Point NRI dependency to latest HEAD, commit b3cabdec0657. That
pulls in the necessary NRI fix for a recently discovered panic
and crash.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
 2023-01-31 15:03:45 +02:00
Samuel Karp
e307f87971
Merge pull request #7847 from fangn2/adding-integration-test-to-opentelemetry 2023-01-30 23:45:57 -08:00
Tony Fang
c46aaa8df4 Add integration test for tracing on image pull 
Create an in-memory exporter and global tracer provider
Pull image with client which should create spans
Validate spans in the exporter

Signed-off-by: Tony Fang <nhfang@amazon.com>
 2023-01-31 05:45:26 +00:00
Derek McGowan
287320d4de
Merge pull request #7840 from hinshun/feature/mount-subdirectory 
Use mount.Target to specify subdirectory of rootfs mount
 2023-01-30 21:35:34 -08:00
Derek McGowan
ee0e22f01c
Merge pull request #8020 from AkihiroSuda/mkdir-etc-cni-0755 
cri: mkdir /etc/cni with 0755, not 0700
 2023-01-30 10:21:30 -08:00
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