github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,706 Commits 3 Branches 2 Tags 112 MiB
6be7c9f4e2
Commit Graph

8706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
7a0f91de6e
Merge pull request #4636 from crosbymichael/ctr-cni 
Add CNI support to ctr run
 2020-10-15 15:47:17 -07:00
Maksym Pavlenko
88f0893540
Merge pull request #4635 from dcantah/fixup-snapshotteropts 
Filter snapshotter labels passed to wrapper of WithNewSnapshot
 2020-10-15 12:09:34 -07:00
Phil Estes
febf14d40f
Merge pull request #4633 from eexe1/patch-1 
Support AppArmor beta version format for Ubuntu 20.10
 2020-10-15 08:41:03 -04:00
Davanum Srinivas
a9cb22309a
Copy pkg/symlink and pkg/truncindex from moby/moby 
moby/moby SHA : 9c15e82f19b0ad3c5fe8617a8ec2dddc6639f40a

github.com/docker/docker/pkg/truncindex/truncindex.go -> pkg/cri/store/truncindex/truncindex.go
github.com/docker/docker/pkg/symlink/LICENSE.APACHE -> pkg/symlink/LICENSE.APACHE
github.com/docker/docker/pkg/symlink/LICENSE.BSD -> pkg/symlink/LICENSE.BSD
github.com/docker/docker/pkg/symlink/README.md -> pkg/symlink/README.md
github.com/docker/docker/pkg/symlink/fs.go -> pkg/symlink/fs.go
github.com/docker/docker/pkg/symlink/fs_unix.go -> pkg/symlink/fs_unix.go
github.com/docker/docker/pkg/symlink/fs_windows.go -> pkg/symlink/fs_windows.go

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-10-15 08:36:35 -04:00
Evan
6d088549c9
Support AppArmor beta version format 
Signed-off-by: Evan Tsai <devillordking@gmail.com>
 2020-10-15 22:55:26 +11:00
Daniel Canter
cdb2f9c66f Filter snapshotter labels passed to WithNewSnapshot 
Made a change yesterday that passed through snapshotter labels into the wrapper of
WithNewSnapshot, but it passed the entirety of the annotations into the snapshotter.
This change just filters the set that we care about down to snapshotter specific
labels.

Will probably be future changes to add some more labels for LCOW/WCOW and the corresponding
behavior for these new labels.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2020-10-15 04:49:39 -07:00
Michael Crosby
21b6f68765 Add CNI support to ctr run 
This adds linux cni support to `ctr run` via a `--cni` flag.  This uses the
default configuration for CNI on `ctr` to configure the network namespace for a
container.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-10-14 22:37:53 -04:00
Maksym Pavlenko
22aea1e9a7
Merge pull request #4629 from deitch/cancel-read-context 
ensure we cancel child context when reading grpc
 2020-10-14 14:07:14 -07:00
Phil Estes
9b70de01d6
Merge pull request #4630 from dcantah/pass-snapshotter-opt 
Cri - Pass snapshotter labels into customopts.WithNewSnapshot
 2020-10-14 10:54:06 -04:00
Daniel Canter
9a1f6ea4dc Cri - Pass snapshotter labels into customopts.WithNewSnapshot 
Previously there wwasn't a way to pass any labels to snapshotters as the wrapper
around WithNewSnapshot didn't have a parm to pass them in.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2020-10-14 04:14:03 -07:00
Wei Fu
be47c2dac0
Merge pull request #4628 from ambarve/lcow_fix_apply_trailing_data 
Read trailing data from tar reader
 2020-10-14 18:02:26 +08:00
Akihiro Suda
b6d7ca7c47
Merge pull request #4626 from dims/bump-to-newer-docker-tag 
Updating to latest docker
 2020-10-14 16:11:13 +09:00
Avi Deitcher
de082e5627 ensure we cancel child context when reading grpc 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
 2020-10-14 09:50:48 +03:00
Amit Barve
d3b817b95c Read trailing data from tar reader 
Not reading all the data from the tar reader causes the
layer digest mismatch which causes failures during unpack
of certain images for lcow. This changes fixes that.

Signed-off-by: Amit Barve <ambarve@microsoft.com>
 2020-10-13 22:38:47 -07:00
Davanum Srinivas
edc671d6a0
disable staticcheck for IsAnInteractiveSession 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-10-13 10:47:18 -04:00
Davanum Srinivas
4044ca9a57
trying docker v19.03.13 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-10-13 10:36:42 -04:00
Phil Estes
e4e05c6c01
Merge pull request #4625 from dcantah/fix-removesandbox-comment 
Fix comment in RemovePodSandbox
 2020-10-13 07:50:02 -04:00
Akihiro Suda
9e5ee68a50
Merge pull request #4623 from dims/update-to-latest-1.19.x-series 
Update to k8s 1.19.2
 2020-10-13 12:34:02 +09:00
Daniel Canter
d74225b588 Fix comment in RemovePodSandbox 
Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2020-10-12 17:59:08 -07:00
Phil Estes
caad53dba7
Merge pull request #4624 from dmcgowan/update-github-ci 
Enable project checks
 2020-10-12 15:35:28 -04:00
Derek McGowan
f12e90937c
Enable project checks 
These checks had to be disabled to get the CRI merge completed.
Now these should be added back.
After CRI merge, more time for lint is needed on mac.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-12 11:37:38 -07:00
Davanum Srinivas
48fb7bf550
Update to k8s 1.19.2 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-10-12 12:51:04 -04:00
Phil Estes
cd2d3519d6
Merge pull request #4621 from Zhang-Jianming/no-pivot-not-working 
fix no-pivot not working in io.containerd.runtime.v1.linux
 2020-10-12 08:14:51 -04:00
zhangjianming
116902cd21 fix no-pivot not working in io.containerd.runtime.v1.linux 
Signed-off-by: zhangjianming <zhang.jianming7@zte.com.cn>
 2020-10-12 09:39:59 +08:00
Phil Estes
98a7355507
Merge pull request #4620 from shouhei/master 
Fix typo in examples of registry config
 2020-10-10 13:24:16 -04:00
shouhei
f1a3235e84 Fix typo in examples of registry config 
Signed-off-by: shouhei <shouhei.yamaguchi.be@gmail.com>
 2020-10-11 01:52:16 +09:00
Phil Estes
14277c6df5
Merge pull request #4613 from dmcgowan/update-test-scripts 
Update test build script to push containerd variant
 2020-10-10 10:01:11 -04:00
Phil Estes
71ed61eef9
Merge pull request #4614 from mxpv/refactor 
Refactor pkg packages
 2020-10-09 09:09:13 -04:00
Maksym Pavlenko
3d02441a79 Refactor pkg packages 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-08 17:30:17 -07:00
Derek McGowan
3a6009c001
Update test build script to push containerd variant 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-08 16:32:32 -07:00
Phil Estes
cb9572ee57
Merge pull request #4612 from mxpv/nightly 
Update nightly CI
 2020-10-08 09:11:10 -04:00
Wei Fu
04c4401acb
Merge pull request #4611 from dmcgowan/move-proto-fmt-ci 
Move proto format ci check to proto job
 2020-10-08 19:57:14 +08:00
Maksym Pavlenko
1f50416cd9 Update nightly CI 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 20:48:10 -07:00
Derek McGowan
8b20ca9d9d
Move proto format ci check to proto job 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 20:19:07 -07:00
Akihiro Suda
915263f269
Merge pull request #4502 from akshat-kmr/master 
Add logging binary support when terminal is true
 2020-10-08 12:14:39 +09:00
Derek McGowan
515133671b
Merge pull request #4609 from mxpv/linter 
Enable linter checks on Windows
 2020-10-07 18:16:55 -07:00
Derek McGowan
45d8a7e4a2
Merge pull request #4588 from thaJeztah/remove_redundant_error 
mount.isFUSE(): remove unused error return, and extract FUSE unmount to a function
 2020-10-07 17:21:27 -07:00
Derek McGowan
822ce4e56e
Merge pull request #4608 from mxpv/refactor 
Refactor CRI related packages
 2020-10-07 17:03:20 -07:00
Samarth Shah
5fc721370d Add manifest digest annotation for snapshotters 
Signed-off-by: Samarth Shah <samarthmshah@gmail.com>
 2020-10-07 23:12:01 +00:00
Maksym Pavlenko
c59d1cd5b0 Fix linter issues 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 15:42:01 -07:00
Maksym Pavlenko
8b046647e6 Use golangci-lint Github Action 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 15:17:56 -07:00
Maksym Pavlenko
8b03df2dae Enable linter on windows 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 15:08:20 -07:00
Maksym Pavlenko
3508ddd3dd Refactor CRI packages 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 14:45:57 -07:00
Maksym Pavlenko
944e9b70e2
Merge pull request #4607 from dmcgowan/cleanup-cri-packages 
Move cri server packages under pkg/cri
 2020-10-07 14:05:38 -07:00
Derek McGowan
b22b627300
Move cri server packages under pkg/cri 
Organizes the cri related server packages under pkg/cri

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 13:09:37 -07:00
Akihiro Suda
f44b072781
Merge pull request #4593 from dmcgowan/merge-cri 
Merge cri master
 2020-10-08 03:41:03 +09:00
Derek McGowan
1c60ae7f87
Use local version of cri packages 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 10:59:40 -07:00
Derek McGowan
e7a350176a
Merge containerd/cri into containerd/containerd 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 10:58:39 -07:00
Derek McGowan
0820015314 Prepare cri for merge to containerd 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 10:58:39 -07:00
Michael Crosby
de546a154f
Merge pull request #4605 from mxpv/nri-fix 
Revendor NRI
 2020-10-07 13:57:37 -04:00