Commit Graph

8445 Commits

Author SHA1 Message Date
Derek McGowan
394be74fdb
Merge pull request #4681 from fuweid/update-godoc-badge
README.md: Use go.dev instead of godoc
2020-11-02 09:42:46 -08:00
Wei Fu
81cf375ec8
Merge pull request #4679 from mikebrow/update-util-versions
updates cri-tools to latest version
2020-11-01 18:56:59 +08:00
Mike Brown
63f673a229 updates cri-tools to latest version
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-31 14:46:44 -05:00
Akihiro Suda
ea56dd3fb6
Merge pull request #4680 from mikebrow/cri-doc-update-testing
refresh cri testing guide after move
2020-10-31 15:01:47 +09:00
Wei Fu
9756153170 README.md: Use go.dev instead of godoc
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-10-31 08:10:05 +08:00
Mike Brown
1ab8bdc27b refresh cri testing guide after move
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-30 18:22:37 -05:00
Michael Crosby
3662dc4c0b
Merge pull request #4673 from ehazlett/ctr-runtime-options
config path option to ctr for runtime
2020-10-30 11:00:14 -04:00
Phil Estes
9a672cca91
Merge pull request #4675 from mikebrow/update-default-config-doc-for-annotations
change default for disable snapshot annotations
2020-10-30 09:33:11 -04:00
Sebastiaan van Stijn
1146098421
replace pkg/symlink with moby/sys/symlink
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 00:05:15 +01:00
Phil Estes
abe1807a13
Merge pull request #4676 from thaJeztah/typo_fix
httpReadSeeker: fix typo in error-message
2020-10-29 18:43:52 -04:00
Sebastiaan van Stijn
b086062cfd
httpReadSeeker: fix typo in error-message
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-29 23:07:43 +01:00
Mike Brown
b6053fb7c3 change default for disablesnapshotannotations
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-29 15:30:13 -05:00
Derek McGowan
5184bccea3
Merge pull request #4631 from dims/copy-a-few-packages-from-moby/moby
Copy pkg/symlink and pkg/truncindex from moby/moby
2020-10-29 09:13:30 -07:00
Evan Hazlett
ef48ef1e4c
add config path option to ctr for runtime
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2020-10-29 15:21:37 +00:00
Wei Fu
f2e8fda82b
Merge pull request #4665 from dmcgowan/update-default-snapshot-annotations
Update make snapshot annotations disabled by default
2020-10-28 21:12:02 +08:00
Amr Mahdi
f6834d4c0b replicate io.Copy optimizations
Signed-off-by: Amr Mahdi <amramahdi@gmail.com>
2020-10-28 05:50:14 +00:00
Derek McGowan
b2642458f9
Update make snapshot annotations disabled by default
This experimental feature should not be enabled by default as
it is not used by any default snapshotters.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-27 21:32:25 -07:00
Akihiro Suda
8ff2707a3c
Merge pull request #4610 from shahzzzam/samashah/add-annotations
Add manifest digest annotation for snapshotters
2020-10-28 13:11:49 +09:00
Maksym Pavlenko
619f96c757
Merge pull request #4664 from deitch/ctr-client-optimize
use proper buffer size for content get
2020-10-27 10:13:06 -07:00
Phil Estes
839b136992
Merge pull request #4656 from zhuangqh/fix-unknown-state
CRI: always set unknown to false when handling exit event
2020-10-27 08:54:30 -04:00
Avi Deitcher
57baf92211 use proper buffer size for content get
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2020-10-27 10:11:55 +02:00
zhuangqh
30c9addd6c fix: always set unknown to false when handling exit event
Signed-off-by: jerryzhuang <zhuangqhc@gmail.com>
2020-10-27 10:50:15 +08:00
Phil Estes
65e39897bf
Merge pull request #4662 from BenTheElder/fifo-dup2-unix
Revender latest containerd/fifo
2020-10-26 19:32:23 -04:00
Benjamin Elder
502d6adc22 Revender latest containerd/fifo
fixes build on arm64

Signed-off-by: Benjamin Elder <bentheelder@google.com>
2020-10-26 14:53:35 -07:00
Akihiro Suda
f51d5f773d
Merge pull request #4657 from mxpv/master
Fix panic in shim not logged
2020-10-27 02:03:38 +09:00
Maksym Pavlenko
4da306e1e9 Fix panic in shim not logged
Fix #4274
Carry #4298

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-10-26 09:05:47 -07:00
Maksym Pavlenko
5afc4b4d8b Revendor latest containerd/fifo
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-10-26 09:04:21 -07:00
Amr Mahdi
289130b8a7 Improve image pull performance from http 1.1 container registries
Private registries that does not support http 2.0 such as Azure Container Registry streams back content in a max of 16KB chunks (max TLS record size). The small chunks introduce an overhead when copying the layers to the content store sine each chunk incurs the overhead of  grpc message that has to be sent to the content store.

This change reduces this overhead by buffering the chunks into 1MB chunks and only then writes a message to the content store.

Below is a per comparsion between the 2 approaches using a couple of large images that are being pulled from the docker hub (http 2.0) and a private Azure CR (http 1.1) in seconds.

image                                                   | Buffered copy | master
-------                                                 |---------------|----------
docker.io/pytorch/pytorch:latest                        |  55.63        | 58.33
docker.io/nvidia/cuda:latest                            |  72.05        | 75.98
containerdpulltest.azurecr.io/pytorch/pytorch:latest    | 61.45         | 77.1
containerdpulltest.azurecr.io/nvidia/cuda:latest        | 77.13         | 85.47

Signed-off-by: Amr Mahdi <amramahdi@gmail.com>
2020-10-26 05:05:09 +00:00
Phil Estes
656b487d33
Merge pull request #4645 from masters-of-cats/master
Check if a process exists before returning it
2020-10-22 10:25:45 -04:00
Giuseppe Capizzi
8eda32e107 Check if a process exists before returning it
Fixes #4632.

Signed-off-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Co-authored-by: Danail Branekov <danailster@gmail.com>
2020-10-22 16:50:14 +03:00
Phil Estes
ba8377590d
Merge pull request #4642 from hectorj2f/hectorj2f/add_d2iq_adopter
Add d2iq as an adopter
2020-10-20 13:07:34 -04:00
Hector Fernandez
b201de01b7 add d2iq as an adopter
Signed-off-by: Hector Fernandez <hfernandez@mesosphere.com>
2020-10-20 18:26:20 +02:00
Akihiro Suda
31a6d11133
Merge pull request #4640 from mxpv/checks
Use project checks
2020-10-20 13:53:38 +09:00
Maksym Pavlenko
f3f8a1d30e Use project checks
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-10-19 18:23:35 -07:00
Derek McGowan
b8ed26b66c
Merge pull request #4639 from mikebrow/enable-cri-integration
getting cri integration up and running
2020-10-19 14:55:19 -07:00
Mike Brown
c876b15b54 getting cri integration up and running
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-19 10:02:05 -05:00
Phil Estes
f36f313448
Merge pull request #4627 from dmcgowan/test-add-tarball-check
Fixes to run node e2e tests
2020-10-19 08:29:20 -04:00
Derek McGowan
04a3f7c499
Update DEPLOY_DIR and VERSION to match installation script
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-16 13:32:58 -07:00
Phil Estes
f8e3c8f187
Merge pull request #4637 from mxpv/ci
Cleanup CI
2020-10-16 08:49:36 -04:00
Maksym Pavlenko
e8fe4b6dc3 Cleanup CI scripts
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-10-15 16:00:43 -07:00
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