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

5305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Fu
94c497984f
Merge pull request #3673 from seemethere/mkdir_man 
gen-manpages: Create man directory if it does not exist
 2019-09-24 10:58:15 +08:00
Lantao Liu
cbbb6a2297 Update release note. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 18:04:17 -07:00
Lantao Liu
fc31fa176d Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 17:51:26 -07:00
Derek McGowan
51f8807d02
Merge pull request #3672 from crosbymichael/kill-errors 
Check for more kill error types
 2019-09-23 16:15:16 -07:00
Derek McGowan
0b224ac7d6
Update metadata interfaces for containers and leases 
Add more thorough dirty checking across all types which
may be deleted and hold references.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-23 15:27:39 -07:00
Eli Uriegas
2a636f8c34
gen-manpages: Create man directory if it does not exist 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-09-23 20:31:26 +00:00
Michael Crosby
0a21292225 Check for more kill error types 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-23 15:36:34 -04:00
Phil Estes
1af133f6c5
Merge pull request #3669 from crosbymichael/crun 
Don't search for state.json path in tests
 2019-09-23 13:18:56 -04:00
Michael Crosby
dd51228094 Don't search for state.json path 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-20 14:35:58 -04:00
Wei Fu
ed16170c4c
Merge pull request #3666 from crosbymichael/metrics 
Add metrics type alias
 2019-09-20 14:19:56 +08:00
Derek McGowan
a0dafd9309
Merge pull request #3649 from dmcgowan/generic-layer-support 
Generic layer support
 2019-09-19 17:43:03 -07:00
Derek McGowan
6f31417d49
Generalize media types 
Avoid directly handling media types with "+" attributes,
instead handling the base and passing through the full
media type to the appropriate stream processor or decompression.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-19 16:09:19 -07:00
Michael Crosby
f3148d0b98 Add metrics type alias 
This will help to decouple the import in CRI from the cgroups package
directly by importing the type alias in containerd repo.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-19 14:13:56 -04:00
Wei Fu
d4802a64f9
Merge pull request #3665 from estesp/golangcideadline 
Move golangci-lint deadline to config file
 2019-09-19 21:51:05 +08:00
Phil Estes
57b51b9481
Move golangci-lint deadline to config file 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-09-19 09:10:56 -04:00
Michael Crosby
6fafc8a724
Merge pull request #3662 from cpuguy83/set_custom_scopes_for_authorizer 
Add function to set custom auth scope in context
 2019-09-18 15:10:51 -04:00
Michael Crosby
a65aa5fe0e
Merge pull request #3661 from cpuguy83/custom_keys_for_fetch_hander 
Get media type key from context
 2019-09-18 14:55:07 -04:00
Brian Goff
e84a84a5a9 Add function to set custom auth scope in context 
Currently auth.docker.io uses a custom auth scope for (docker) plugins
`repository(plugin):<repo>:<perms>`.
This makes it impossible to use containerd distribution tooling to fetch
plugins without also supplying a totally custom authorizer.

This changes allows clients to set the correct scope on the context.
It's a little bit nasty but "works".

I'm also a bit suspect of some a couple of these unexported context
functrions. Before the primary one used `contextWithRepositoryScope`
overwrites any scope value and there is another one that appends the
scope value.
With this change they both append...

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2019-09-18 11:29:16 -07:00
Brian Goff
bca374aa1b Get media type key from context 
Adds a method for setting a custom media type key prefix used by the
fetch handler.
This allows both overwriting a built-in prefix (for reasons?) as well as
supplying a custom media type.

I added this because I was getting an error on `FetchHandler` when
pulling docker plugin images which have their own media type.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2019-09-18 11:26:50 -07:00
Michael Crosby
324a94790d
Merge pull request #3659 from katiewasnothere/shimreconnectupstream 
fail on file not found for shim reconnect on containerd restart
 2019-09-18 12:50:08 -04:00
Phil Estes
a7e67ff9aa
Merge pull request #3655 from crosbymichael/shmsize 
Add Opt for modifying shm size
 2019-09-18 11:54:46 -04:00
Michael Crosby
e4dc2f662b
Merge pull request #3660 from fuweid/me-golint 
Makefile: increase deadline to 2m for golangci-lint
 2019-09-18 10:35:20 -04:00
Michael Crosby
20d3fae3db Add Opt for modifying shm size 
Closes #3654

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-18 10:20:36 -04:00
Phil Estes
c3452abae4
Merge pull request #3656 from crosbymichael/stress 
Fix density spec generation
 2019-09-18 09:19:20 -04:00
Wei Fu
83a72858f8 Makefile: increase deadline to 2m for golangci-lint 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-09-18 11:53:56 +08:00
Kathryn Baldauf
b4211d94e2 fail on file not found for shim reconnect on containerd restart 
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
 2019-09-17 14:49:29 -07:00
Michael Crosby
fd6299be98 Fix density spec generation 
Fixes #3580

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-17 16:21:25 -04:00
Derek McGowan
87bff67128
Merge pull request #3657 from crosbymichael/golint 
Try set GOGC for golint
 2019-09-17 13:19:45 -07:00
Michael Crosby
3bc99755d4 Try set GOGC for golint 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-17 14:52:49 -04:00
Phil Estes
86442dfbb9
Merge pull request #3653 from lalyos/fix-connect-timeout 
implement ctr --connect-timeout
 2019-09-16 10:52:03 -04:00
Lajos Papp
19ecd49ed0 implement ctr -connect-timeout 
Signed-off-by: Lajos Papp <lalyos@yahoo.com>
 2019-09-16 13:56:53 +02:00
Michael Crosby
93391048bd
Merge pull request #3650 from dmcgowan/fix-vendor-issue 
Fix missing vendor packages
 2019-09-13 09:11:57 -04:00
Phil Estes
c51895bde0
Merge pull request #3651 from dmcgowan/skip-darwin-deploy 
Skip darwin deploy on release
 2019-09-13 08:55:50 -04:00
Derek McGowan
8ab81a0c2a
Merge pull request #3642 from dmcgowan/remove-duplicated-travis-tests 
[CI] remove extra testing on older Ubuntu
 2019-09-12 18:45:08 -07:00
Derek McGowan
58892a3ba5
Skip darwin deploy 
Currently removing this incomplete build is part of the release
process. Skip this deployment to make releases easier.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-12 18:40:36 -07:00
Derek McGowan
5bb0281d16
Fix missing vendor packages 
The switch to urfave/cli had a use of a /v2 API, which
go modules handles correctly but vndr ignores. Downgrade
urfave/cli for now until the switch to go modules. Add
missing dependencies, which vndr now sees.
Note that CI was not catching this issue, it seems that
some part of the build process was pulling in dependencies
even if they weren't in vendor, causing the build to work.
However the vendor check was not seeing it. The ARM build
didn't pull in other dependencies into the gopath, causing
those builds to break.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-12 18:35:40 -07:00
Derek McGowan
9741f03932
Merge pull request #3648 from crosbymichael/man-bin 
Move manpage gen to separate binary
 2019-09-12 13:46:00 -07:00
Michael Crosby
5a656cacb4 Move manpage gen to separate binary 
This moves the man page generation to a separate binary

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-12 14:19:00 -04:00
Michael Crosby
9c77ec3c73
Merge pull request #3644 from Random-Liu/finish-cri-release 
Publish cri release to gs://cri-containerd-release.
 2019-09-12 09:38:05 -04:00
Lantao Liu
6ed809168e Publish cri release to gs://cri-containerd-release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-12 00:31:53 -07:00
Derek McGowan
1d484c28ea
Merge pull request #3643 from Random-Liu/skip-cleanup 
Skip cleanup in travis deploy and avoid gcs race condition.
 2019-09-11 18:05:34 -07:00
Lantao Liu
f997c30ec6 Skip cleanup in travis deploy and avoid gcs race condition. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-11 16:51:41 -07:00
Derek McGowan
2d4dc24154
Merge pull request #3641 from Random-Liu/add-encrypted-key 
Encrypt the secret file in containerd/containerd.
 2019-09-11 15:29:16 -07:00
Derek McGowan
36c543a726
Remove extra CI testing on older Ubuntu 
Testing the older LTS does not require testing the full matrix
to test for compatibility.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-11 13:47:48 -07:00
Derek McGowan
d3ccbc66ed
Merge pull request #3637 from crosbymichael/manpages 
Use updated urfave/cli to generate man pages
 2019-09-11 13:45:04 -07:00
Lantao Liu
4e8a49948c Encrypt the secret file in containerd/containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-11 13:24:54 -07:00
Michael Crosby
f3a5b8c0a9 Add command to generate man pages 
The climan package has a command that can be registered with any urfav
cli app to generate man pages.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-11 15:31:02 -04:00
Michael Crosby
d8ad1bdbb3
Merge pull request #3638 from Random-Liu/upload-gcs-cri-release 
Update gcs cri release.
 2019-09-11 15:05:41 -04:00
Lantao Liu
d1a12823b7 Update gcs cri release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-11 11:22:01 -07:00
Phil Estes
65a6d0a82f
Merge pull request #3639 from crosbymichael/go-runc 
Update go-runc to e029b79d8cda8374981c64eba71f28e
 2019-09-11 11:44:59 -04:00