github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
4,583 Commits 3 Branches 2 Tags 112 MiB
5703f415c6
Commit Graph

4583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
5703f415c6
Merge pull request #3197 from Random-Liu/add-required-plugins 
Add support for required plugins.
 2019-04-11 12:02:16 +02:00
Lantao Liu
4b3b99ea11 Add support for required plugins. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-10 11:31:59 -07:00
Phil Estes
475619c29e
Merge pull request #3195 from crosbymichael/ttrpc-love 
Use ttrpc in the daemon for event publishing from shims
 2019-04-10 10:29:01 +02:00
Michael Crosby
a6f587e4c4 Use ttrpc to publish runtime v2 events 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-09 14:38:50 -04:00
Michael Crosby
a8a805cad3 Add ttrpc server to containerd 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-09 13:08:23 -04:00
Phil Estes
db3a8637c1
Merge pull request #3194 from crosbymichael/shim-oom 
Add GetOOMScore function
 2019-04-09 17:30:52 +02:00
Michael Crosby
c93d645435 Add GetOOMScore function 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-09 10:40:54 -04:00
Phil Estes
aaca11c40d
Merge pull request #3189 from dmcgowan/extended-security-releases 
Extend release timeline
 2019-04-09 00:37:14 -04:00
Phil Estes
993fb310f6
Merge pull request #3160 from sofat1989/imageresume 
delete the ingest when any errors happen during resuming status
 2019-04-09 00:34:28 -04:00
Akihiro Suda
4d313c00ab
Merge pull request #3186 from thaJeztah/bump_dependencies 
Bump dependencies
 2019-04-06 13:28:24 +09:00
fesu
7045801fd4 delete the ingest when any errors happen during resuming status 
Signed-off-by: Su Fei  <fesu@ebay.com>
 2019-04-06 11:21:18 +08:00
Derek McGowan
dcf6023c4c
Extend release timeline 
Update releases active releases with latest version and timeline.
Extend 1.1 an additional 3 months to align with k8s 1.11 EOL and 3 months extended for security.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-04-05 12:27:01 -07:00
Phil Estes
d77a5bf72d
Merge pull request #3188 from masters-of-cats/clean-test 
Introduce 'clean-test' target in Makefile
 2019-04-05 14:24:07 -04:00
Georgi Sabev
d5b770aa87 Introduce 'clean-test' target in Makefile 
When tests fail they could leave debris behind such as
- overlay mounts
- cgroups
- metadata
These debris can cause subsequent tests to fail

Co-authored-by: Danail Branekov <danailster@gmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
 2019-04-05 17:17:03 +03:00
Sebastiaan van Stijn
2583d9e426
update gogo/googleapis v1.2.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:19 +02:00
Sebastiaan van Stijn
a98df70da1
update containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:16 +02:00
Sebastiaan van Stijn
aa8dccd220
update containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:13 +02:00
Sebastiaan van Stijn
ed61d7f680
bump containerd/zfs and dependencies 
temporarily adds both pborman/uuid and google/uuid,
pending mistifyio/go-zfs#72

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:10 +02:00
Sebastiaan van Stijn
d667628ca9
bump github.com/pkg/errors v0.8.1 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:08 +02:00
Sebastiaan van Stijn
68ef178352
bump github.com/BurntSushi/toml v0.3.1 
switch the licenses of cmd/ to be the same as the root

full diff: a368813c5e...3012a1dbe2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:05 +02:00
Sebastiaan van Stijn
1978c0b74b
bump gotest.tools v2.3.0, google/go-cmp v0.2.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 14:55:02 +02:00
Michael Crosby
591e52c504
Merge pull request #3185 from thaJeztah/update_dev_dockerfile 
Update contrib/Dockerfile.test
 2019-04-05 08:39:46 -04:00
Sebastiaan van Stijn
2741dbe2c1
contrib: Dockerfile: bump go 1.12 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 12:59:20 +02:00
Sebastiaan van Stijn
a84f87d84f
contrib: Dockerfile: add a base stage 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 12:26:55 +02:00
Sebastiaan van Stijn
a07e12cded
contrib: Dockerfile: reformat, and use --no-install-recommends 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 12:24:41 +02:00
Sebastiaan van Stijn
ba9e1ea23c
contrib: Dockerfile: use build-arg for go-version 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 12:16:36 +02:00
Phil Estes
eea500d122
Merge pull request #3179 from Random-Liu/publish-error 
Return event publish errors
 2019-04-04 20:35:34 -04:00
Phil Estes
6e170ec5b7
Merge pull request #3176 from Random-Liu/update-cri-master 
Update cri to 6d353571e6.
 2019-04-04 20:34:34 -04:00
Derek McGowan
9990eed314
Merge pull request #3178 from crosbymichael/exitStatus 
Export ExitStatus init func
 2019-04-04 16:23:15 -07:00
Derek McGowan
a7e30fae99
Merge pull request #3173 from crosbymichael/reg-errors 
Update handling of registry errors
 2019-04-04 15:14:04 -07:00
Lantao Liu
74eb0dc812 Return event publish errors. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-04 14:55:38 -07:00
Michael Crosby
10cf21dcf7 Export ExitStatus init func 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-04 17:46:16 -04:00
Lantao Liu
a733587496 Update cri to 6d353571e6. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-04 14:02:08 -07:00
Michael Crosby
de1da8be32 Update handling of registry errors 
Update to #3109

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-04 14:51:03 -04:00
Derek McGowan
4edc7336a2
Merge pull request #3169 from crosbymichael/runcbump 
Update runc to resolve selinux issues
 2019-04-04 10:38:57 -07:00
Michael Crosby
9bc231532d
Merge pull request #3109 from bainsy88/issue_3076 
Add code to return errors from registries
 2019-04-04 13:23:37 -04:00
Michael Crosby
b7183a06be
Merge pull request #3116 from thaJeztah/bump_protobuf 
Bump protobuf v1.2.0
 2019-04-04 13:20:29 -04:00
Michael Crosby
abfc89ce02 Update CRI to master 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-04 10:43:40 -04:00
Michael Crosby
4730088cb5 Update runc to resolve selinux issues 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-04 10:36:04 -04:00
Sebastiaan van Stijn
2d11f5e6d5
Regenerate protobufs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 23:41:15 +02:00
Sebastiaan van Stijn
830b0294cc
Update protobuf v1.2.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 23:27:16 +02:00
Phil Estes
e16368d21f
Merge pull request #3171 from thaJeztah/bump_logrus 
bump sirupsen/logrus v1.4.1
 2019-04-03 17:20:02 -04:00
Michael Crosby
fdeb1084d3
Merge pull request #3170 from thaJeztah/unkeyed_fields 
do not use unkeyed fields in composite literals
 2019-04-03 16:59:14 -04:00
Sebastiaan van Stijn
7c1365b468
bump sirupsen/logrus v1.4.1 
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 22:23:53 +02:00
Sebastiaan van Stijn
01310eaebc
do not use unkeyed fields in compose literals 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 22:20:39 +02:00
Phil Estes
c9977b59f6
Merge pull request #3166 from mxpv/refactor 
Move snapshotters benchmark to a separate package
 2019-04-03 08:37:03 -04:00
Maksym Pavlenko
90085a7ac5 Add empty file to prevent build from failing 
Go build fails on directory with only test files
https://github.com/golang/go/issues/8279

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-02 17:35:19 -07:00
Maksym Pavlenko
8784eb6308 Move snapshotters benchmark to a separate package 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-02 14:42:21 -07:00
Derek McGowan
2f60e389a0
Merge pull request #2626 from krsoninikhil/defaults3 
Uses namespace labels for default options
 2019-04-02 11:46:35 -07:00
Phil Estes
22bb5ebc7f
Merge pull request #3159 from thaJeztah/fix_parseinfofile_parsing 
Fix parseInfoFile does not handle spaces in filenames
 2019-04-02 09:40:26 -04:00