github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,002 Commits 3 Branches 2 Tags 112 MiB
1edab60723
Commit Graph

9002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
8a0bd84b9a
Merge pull request #1056 from Random-Liu/add-sandbox-log-dir-annotation 
Add an OCI annotation for sandbox log directory.
 2019-03-08 01:32:38 -08:00
Michael Crosby
a15b6e2097
Merge pull request #3081 from thaJeztah/bump_runc 
update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30
 2019-03-07 15:10:41 -06:00
Sebastiaan van Stijn
b8d40b3535
update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30 
This includes an improved fix for CVE-2019-5736 to reduce the
increased memory-consumption introduced by the original patch,
RHEL 7.6 getting into a loop due to a kernel bug in those kernels,
and improve compatibility with older kernels.

changes included:

- opencontainers/runc#1973 Vendor opencontainers/runtime-spec 29686dbc
- opencontainers/runc#1978 Remove detection for scope properties, which have always been broken
- opencontainers/runc#1963 Vendor in go-criu and use it for CRIU's RPC definition
- opencontainers/runc#1995 exec: expose --preserve-fds
- opencontainers/runc#2000 fix preserve-fds flag may cause runc hang
- opencontainers/runc#1968 Create bind mount mountpoints during restore
- opencontainers/runc#1984 nsenter: cloned_binary: "memfd" cleanups

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-07 21:30:26 +01:00
Stefan Berger
09cf2a629b Extend metadata images test with fieldpaths for Annotations 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-03-07 14:20:56 -05:00
Stefan Berger
5124f9ee54 Write the Annotations map into the bolt db 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-03-07 13:55:58 -05:00
Stefan Berger
02cc1485df Prepare boltutil for reading and writing another map 
Refactor the code so that another function can also read and write maps
into the bolt db.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-03-07 13:55:22 -05:00
Maksym Pavlenko
1e893b19ce
devmapper: add no_devmapper build tag 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-03-07 10:53:19 -08:00
Derek McGowan
aa328dfc55
Merge pull request #3041 from thaJeztah/bump_da_bolt 
Update go.etcd.io/bbolt to v1.3.2
 2019-03-07 09:28:26 -08:00
Shengjing Zhu
c6729fe0c4 Use ParseSignal and AtomicWriteFile functions from containerd 
Containerd has its own ParseSignal and AtomicWriteFile implementation.
So there's no need to use these function from github.com/docker/docker.

Signed-off-by: Shengjing Zhu <i@zhsj.me>
 2019-03-08 00:51:04 +08:00
Phil Estes
5fdcef55a2
Merge pull request #3075 from ehotinger/with-new-snapshot 
Allow WithNewSnapshot and WithNewSnapshotView to take in snapshotter opts
 2019-03-07 11:15:18 -05:00
Michael Crosby
cfba7ef8e2
Merge pull request #3064 from dmcgowan/update-gc-content-references 
Add content gc ref labels from containers, images, and snapshots
 2019-03-07 09:52:53 -06:00
Lantao Liu
9eabcf525e Add an OCI annotation for sandbox log directory. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-06 16:43:36 -08:00
Stefan Berger
79248fea2b Add test for ocispec.Descriptor Annotations 
Make sure that Annotations we write into ocispec.Descriptors are
written into the store and can be read back.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-03-06 16:59:39 -05:00
Eric Hotinger
34f3772956 Allow WithNewSnapshot and WithNewSnapshotView to take in snapshotter options. 
Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
 2019-03-06 13:22:37 -08:00
Phil Estes
04b2e5bbf7
Merge pull request #3072 from crosbymichael/v2opts 
Fix runtime v2 option handling
 2019-03-06 14:27:02 -05:00
Michael Crosby
aaae81189a Update checkpoint opts with runtime handling 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-03-06 12:42:45 -05:00
Michael Crosby
160737d2c8 Fix no pivot and keyring opts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-03-06 12:37:36 -05:00
Stefan Berger
0b711d616a Copy annotations around where necessary 
Make sure that the newly added annotations are copied around appropriately.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-03-06 12:26:23 -05:00
Phil Estes
bfbd1d09c9
Merge pull request #3070 from darfux/update-build-doc 
BUILDING.md: update testing section
 2019-03-06 08:53:38 -05:00
Li Yuxuan
4d2a26d751 BUILDING.md: update testing section 
The integration-parallel has been removed by
4df7075a74.
Update Makefile targets in BUILDING.md.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2019-03-06 18:56:14 +08:00
Michael Crosby
e70a530aa3
Merge pull request #3069 from fuweid/me-debug-mode-push 
ctr/commands/images/push: don't show progress if it is debug mode
 2019-03-05 11:10:51 -06:00
Wei Fu
6424a36032 ctr/commands/images/push: don't show progress if it is debug mode 
If user sets debug mode, the command push should only show the debug log
information. If the stdout is with flush by the progress status, it is
hard to see the debug log.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-03-05 22:21:55 +08:00
Derek McGowan
7cfb99ab9d
Add content gc ref labels from containers, images, and snapshots 
Currently the objects which can retain content from labels
are limited. This limitation has required clients to work
around this and and in some cases add outside reference
counting (e.g. buildkit keeping content for snapshots).
Updated the logic to treat content and snapshot labels equally
and simplified the code in the process.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-03-04 14:51:07 -08:00
Lantao Liu
95f564f95b
Merge pull request #1072 from Random-Liu/clean-path 
Use clean path for map and comparison.
 2019-03-04 14:01:41 -08:00
Michael Crosby
30b6f460b9
Merge pull request #3063 from zhsj/fix-mipsx 
Use unix.SignalNum in ParseSignal on unix platform
 2019-03-04 11:31:16 -06:00
Michael Crosby
63328c1d2a
Merge pull request #3054 from jterry75/stderr_with_tty_windows 
Fix issue with NewFIFOSetInDir with Terminal true
 2019-03-04 11:08:06 -06:00
Lantao Liu
0464298b1e Use clean path for map and comparison. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-03 21:19:50 -08:00
Shengjing Zhu
f0d5dd3c82 Use unix.SignalNum in ParseSignal on unix platform 
This removes the signalMap on unix platform, since
the signalMap on different architectures is not same,
especially it's wrong on mipsx.

golang.org/x/sys/unix now has a SignalNum func to convert
signal name to a number, thus there's no need to keep
this redundant map.

Windows platform still needs to have a signalMap, since
golang.org/x/sys/windows doesn't have corresponding
functions.

Address: #3061

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2019-03-03 22:10:58 +08:00
Shengjing Zhu
1745951bad Vendor golang.org/x/sys d455e41777fca6e8a5a79e34a14b8368bc11d9ba 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2019-03-03 21:35:46 +08:00
Derek McGowan
5840ecc3d8
Merge pull request #3056 from ehotinger/ehotinger/snapshotter-docs 
Update the snapshotter docs to refer to the snapshots package
 2019-02-28 17:27:00 -08:00
Eric Hotinger
e13a4b67e8 Update the snapshotter docs to refer to the snapshots package for 
WithLabels.

Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
 2019-02-28 15:03:37 -08:00
Lantao Liu
210e80289b
Merge pull request #1055 from Random-Liu/use-right-sandbox-config 
Use the correct sandbox config.
 2019-02-28 13:02:39 -08:00
Justin Terry (VM)
277147135d Fix issue with NewFIFOSetInDir with Terminal true 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-02-28 10:35:26 -08:00
Lantao Liu
f2f90f6b00
Merge pull request #1060 from Random-Liu/support-stream-idle-timeout 
Support stream idle timeout.
 2019-02-28 10:28:27 -08:00
Lantao Liu
8222da7768 Support stream idle timeout. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-28 01:30:01 -08:00
Lantao Liu
c0f48369ca
Merge pull request #1063 from haiyanmeng/runtime_handler 
Add RuntimeHandler into PodSandbox and PodSandboxStatus
 2019-02-28 01:16:20 -08:00
Lantao Liu
0f02c9b343
Merge pull request #1066 from Random-Liu/add-more-explaination-about-cri-config 
Add more explanation about the CRI config.
 2019-02-28 01:15:25 -08:00
Derek McGowan
c24a74354c
Merge pull request #3050 from jterry75/fix_cpu_cap 
Fix a bug in shim log on Windows that can cause 100% CPU utilization
 2019-02-27 17:32:38 -08:00
Justin Terry (VM)
828f6eb842 Fix a bug in shim log on Windows that can cause 100% CPU utilization 
With the change to unified shims (ie: 1 shim per multiple tasks) the shimLog
on Windows for the 2nd-Nth worload containers will not have an associated
named pipe listener.

Due to a subtle bug in errors.Wrap passing a nil error we would unblock the
disconnected listener and return 0 byte successfull reads which would cause go
to continually read and cap the CPU.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-02-27 16:51:52 -08:00
Lantao Liu
76ed153e8c Add more explanation about the CRI config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-27 16:51:36 -08:00
haiyanmeng
9dea9d39f5
Add RuntimeHandler into PodSandbox and PodSandboxStatus 
The upstream CRI change: https://github.com/kubernetes/kubernetes/pull/73833

Signed-off-by: Haiyan Meng <haiyanmeng@google.com>
 2019-02-27 16:49:35 -08:00
Lantao Liu
8d75261190
Merge pull request #1065 from alculquicondor/fix/architecture 
Fix architecture doc
 2019-02-27 16:42:26 -08:00
Aldo Culquicondor
c88e18b907 Fix architecture doc 
Network namespace is created before the pause container.

Signed-off-by: Aldo Culquicondor <acondor@google.com>
 2019-02-27 18:00:40 -05:00
Stefan Berger
c6703d4c76 Add missing annotations map to Descriptor for gRPC transfer 
Add the annotations map to the gRPC Descriptor message.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2019-02-27 10:41:17 -05:00
Mike Brown
ec3aa44591
Merge pull request #1058 from haiyanmeng/update-k8s-version 
Update kubernetes to v1.15.0-alpha.0
 2019-02-27 07:39:11 -06:00
Akihiro Suda
e72ad44427
Merge pull request #3048 from crosbymichael/bump-cgroups 
Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97
 2019-02-27 17:37:47 +09:00
Michael Crosby
d2bec5422a Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97 
This fixes issues for systemd 420 and non-existant cgroups.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-02-26 15:48:10 -05:00
Haiyan Meng
035ce6c975
Update test based on new PullImage CRI. 
Signed-off-by: Haiyan Meng <haiyanmeng@google.com>
 2019-02-26 12:43:54 -08:00
haiyanmeng
fd44b9a5d0
Update kubernetes to v1.15.0-alpha.0 
Signed-off-by: Haiyan Meng <haiyanmeng@google.com>
 2019-02-26 11:13:11 -08:00
Lantao Liu
87dba924de Use the correct sandbox config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-22 15:37:07 -08:00