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

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
fc31fa176d Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 17:51:26 -07:00
Angela Li
dc413bd6d6 Add windows portforward support 
Signed-off-by: Angela Li <yanhuil@google.com>
 2019-09-23 17:36:43 -07:00
Lantao Liu
56fa16ef9c Update the kube-up doc with a simpler approach. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 17:24:10 -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
Lantao Liu
b4c46db790 Fix indent in cni.template. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 16:08:39 -07:00
Lantao Liu
f7f64fdefd
Merge pull request #1289 from Random-Liu/ignore-permission-denied 
Ignore temporary permission denied error.
 2019-09-23 15:36:26 -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
Lantao Liu
67440484f2 Ignore temporary permission denied error. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 12:17:24 -07: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
c8c7c54a6e Use typealias for containerd metrics 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-20 16:01:48 -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
Michael Crosby
437123646a Update containerd to ed16170c4c 
1.3.0+2

Includes changes for cgroup metrics type alias

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-20 10:06:22 -04:00
Wei Fu
ed16170c4c
Merge pull request #3666 from crosbymichael/metrics 
Add metrics type alias
 2019-09-20 14:19:56 +08:00
Lantao Liu
470776c903
Merge pull request #1274 from Random-Liu/dualstack 
Add DualStack support
 2019-09-19 21:32:26 -07: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
Lantao Liu
c1ece0c801 Address comment. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-19 14:05:28 -07:00
Lantao Liu
b431316edd
Merge pull request #1280 from estesp/add-default-path-env 
Add back default UNIX env to container config
 2019-09-19 11:41:03 -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
Lantao Liu
df88e190c3
Merge pull request #1281 from estesp/golangci-config 
Move golangci-lint configuration out of Makefile
 2019-09-19 10:27:20 -07: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
161abf8f5b
Fix golangci-lint findings 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-09-19 09:38:40 -04:00
Phil Estes
1e3cd5b052
Move golangci-lint configuration out of Makefile 
Add 2m deadline; similar to containerd, recent issues with golangci-lint
taking more than 1 minute (seen in recent containerd/cri PRs as well).

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-09-19 09:23:12 -04: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
Phil Estes
229eb19bd6
Add back default UNIX env to container config 
Due to changes to the defaults in containerd, the CRI path to creating a
container OCI config needs to add back in the default UNIX $PATH (and
any other defaults) as that is the expected behavior from other
runtimes.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-09-19 09:00:25 -04:00
Lantao Liu
35eb96d901 Update deployment and integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 17:21:37 -07:00
Lantao Liu
5a68bd70c8 Update kubernetes to 1.16.0-rc.2 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 17:21:37 -07:00
Antonio Ojea
fcd6bf318b Report Additional POD IPs 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 17:21:37 -07: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
Lantao Liu
9d60f9c56e
Merge pull request #1264 from Random-Liu/windows-support-2 
Add Implementation for WCOW process isolation support.
 2019-09-18 11:38:11 -07: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
Lantao Liu
7e96aaab09 Add CRI Validation test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 10:46:29 -07:00
Lantao Liu
dc964de85f Add windows implmenetation 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 10:46:29 -07:00
Lantao Liu
bbcf564745 Add windows image platform comparer 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 10:46:28 -07:00
Lantao Liu
c6cb25c158 Open/create log file with FILE_SHARE_DELETE on windows 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 10:46:28 -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