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

8706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
4509efc303
Merge pull request #3683 from yuxiaobo96/containerd-update3 
fix-up typo
 2019-09-26 09:42:33 -04:00
yuxiaobo
62c2eea78d fix-up typo 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
 2019-09-26 13:02:03 +08:00
Lantao Liu
1629277497
Merge pull request #1300 from Random-Liu/hostname-test 
Add hostname CRI validation and unit test.
 2019-09-25 20:09:13 -07:00
Lantao Liu
358d672160 Add hostname CRI validation and unit test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-25 16:11:27 -07:00
Derek McGowan
1c42610d98
Merge pull request #3680 from crosbymichael/btrfs-flake 
Sync and stat btrfs loopback in tests
 2019-09-25 13:47:31 -07:00
Michael Crosby
c5821baa41 Sync and stat btrfs loopback in tests 
Fixes #3676

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-25 15:40:16 -04:00
Lantao Liu
7fba77f238
Merge pull request #1298 from Random-Liu/set-sandbox-cpu-shares 
Set default sandbox container cpu shares on windows.
 2019-09-25 11:05:43 -07:00
Mike Brown
a1e4f99a32
Merge pull request #1296 from Random-Liu/fix-ssh-disconnect 
Set keepalive for ssh in windows test.
 2019-09-25 10:02:59 -05:00
Phil Estes
da66333271
Merge pull request #3677 from dmcgowan/gc-fix-notes 
Add release note for gc fix
 2019-09-25 08:29:36 -04:00
Phil Estes
c10e6a1029
Merge pull request #3679 from yuxiaobo96/containerd-update2 
Perfect documentation
 2019-09-25 08:28:49 -04:00
Phil Estes
4cd5de74bd
Merge pull request #3678 from yuxiaobo96/containerd-update 
Word spelling correction
 2019-09-25 08:27:24 -04:00
yuxiaobo
5ea9363624 Perfect documentation 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
 2019-09-25 16:59:31 +08:00
yuxiaobo
a0ae24b984 Word spelling correction 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
 2019-09-25 16:49:54 +08:00
Lantao Liu
2eba67a7ee
Merge pull request #1287 from crosbymichael/cgroups 
Use type alias from containerd for cgroup metric types
 2019-09-24 17:34:49 -07:00
Derek McGowan
85eac2550f
Add release note for gc fix 
Adds note for garbage collection fix related to removal
of leases, containers, and images.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-24 17:05:06 -07:00
Lantao Liu
f3ef10e9a2 Set default sandbox container cpu shares on windows. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-24 17:03:11 -07:00
Lantao Liu
4a0b0a883f Set keepalive for ssh in windows test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-24 16:57:31 -07:00
Lantao Liu
36f393dc6d
Merge pull request #1292 from Random-Liu/better-kube-up 
Document simpler kube-up.sh
 2019-09-24 13:17:17 -07:00
Lantao Liu
44e1f8ded5
Merge pull request #1294 from jterry75/fix_windows_hostname_upstream 
Forward SandboxConfig.Hostname to Workload container activation
 2019-09-24 11:40:51 -07:00
Justin Terry (VM)
ed7873ef1e Forward SandboxConfig.Hostname to Workload container activation 
1. For Windows the Hostname property is not inherited from the sandbox and must
be passed for the Workload container activations as well.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-09-24 10:21:17 -07:00
Mike Brown
4f203aa8ba
Merge pull request #1293 from Random-Liu/update-hcsshim 
Update hcsshim to c088f411aaf3585d8dffc9deb4289ffa32854497.
 2019-09-24 10:07:56 -05:00
Michael Crosby
aba201344e
Merge pull request #3675 from Random-Liu/update-cri-release-1.3 
Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
 2019-09-24 11:06:18 -04:00
Phil Estes
9c10bf89ba
Merge pull request #3668 from dmcgowan/fix-metadata-dirty 
Update metadata interfaces for containers and leases
 2019-09-24 09:38:27 -04:00
Lantao Liu
e8a788d786 Update hcsshim to c088f411aaf3585d8dffc9deb4289ffa32854497. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-24 00:11:58 -07:00
Lantao Liu
bad68a8270
Merge pull request #1284 from liyanhui1228/win_portforward 
Add windows port forward support
 2019-09-23 22:17:08 -07:00
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
Mike Brown
0a6d9f188b
Merge pull request #1291 from Random-Liu/fix-indent-cni 
Fix indent in cni.template.
 2019-09-23 19:52:31 -05:00
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