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

1444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harshal Patil
effd82227c Add support for passing sandbox annotations to runtime 
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2019-03-21 14:38:14 +05:30
Lantao Liu
8672929207
Merge pull request #1090 from mikebrow/filter-masks-when-privileged 
Add test for filtering container create masks when privileged
 2019-03-14 14:01:38 -07:00
Lantao Liu
0937e87ccc
Merge pull request #1092 from Random-Liu/set-runtime-handler-default 
Set default "" to extra runtime handler.
 2019-03-14 13:51:39 -07:00
Lantao Liu
bb4260cecb Set default "" to extra runtime handler. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-14 13:10:15 -07:00
Mike Brown
bf4e7a885c test filtering of container create masks when privileged 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-03-14 08:17:56 -05:00
Lantao Liu
9c9bf1d7a1
Merge pull request #1069 from tallclair/runtimehandler-setup 
Expose environment variables for configuring an additional runtime handler
 2019-03-14 00:22:42 -07:00
Lantao Liu
8d84e3f9ca
Merge pull request #1088 from mikebrow/tarball-doc-update 
clarify the versioning for the tarball
 2019-03-14 00:17:44 -07:00
Mike Brown
9474b05dd7 clarify the versioning for the tarball 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-03-13 12:58:12 -05:00
Tim Allclair
d7c5b246c6 Expose vars to configure an additional runtime handler 
Expose environment variables in the GCE containerd configuration
script for configuring an additional runtime handler. This unblocks
E2E testing of custom runtime handlers.

Signed-off-by: Tim Allclair <tallclair@google.com>
 2019-03-12 14:44:20 -07:00
Lantao Liu
f5ff4394b9
Merge pull request #1085 from Random-Liu/hostname-backward-compatibility 
Fix /etc/hostname backward compatibility issue for in-place upgrade.
 2019-03-12 13:04:50 -07:00
Lantao Liu
3691cb6550 Fix /etc/hostname backward compatibility issue for in-place upgrade. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-12 01:17:41 -07:00
Lantao Liu
d582333451
Merge pull request #1083 from Random-Liu/support-docker-18-09 
Support docker 18.09 in the test script.
 2019-03-11 10:30:48 -07:00
Lantao Liu
ade85e643e Support docker 18.09 in the test script. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-11 00:55:08 -07:00
Lantao Liu
25442a865c
Merge pull request #1080 from zhsj/rm-partial-docker 
Use ParseSignal and AtomicWriteFile functions from containerd
 2019-03-08 10:53:05 -08:00
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
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
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
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
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
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
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
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
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
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
Lantao Liu
fbce57903c
Merge pull request #1053 from mikebrow/k8s-1.10-end-of-life 
update support statment reflecting eol for k8s 1.10
 2019-02-14 11:11:07 -08:00
Mike Brown
857f169e9e update support statment reflecting eol for k8s 1.10 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-02-14 11:28:26 -06:00
Lantao Liu
b2cd840042
Merge pull request #1045 from Random-Liu/fix-env-performance-issue 
Fix env performance issue
 2019-02-12 11:03:33 -08:00
Lantao Liu
877c1cadc1 Include default envs from containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-12 10:29:45 -08:00
Lantao Liu
9e2ce3494d
Merge pull request #1042 from Random-Liu/etc-hostname 
Set /etc/hostname.
 2019-02-12 10:15:11 -08:00
Lantao Liu
ec6dd37691 Add env cache. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-12 03:02:20 -08:00
Lantao Liu
89717d0b63 Don't log config at info level. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-12 02:07:53 -08:00
Lantao Liu
aed43ef13a
Merge pull request #1043 from thaJeztah/bump_containerd 
Update containerd to 4543e32a8b
 2019-02-12 01:33:56 -08:00
Lantao Liu
089d4fbfb8 Set /etc/hostname. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-12 00:18:00 -08:00
Sebastiaan van Stijn
bc7d40057d
Update containerd to 4543e32a8b 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-08 16:12:28 +01:00
Lantao Liu
04416381c1
Merge pull request #1040 from thaJeztah/remove_normalize_image_ref 
Replace util.NormalizeImageRef with reference.ParseDockerRef
 2019-02-07 18:47:40 -08:00
Sebastiaan van Stijn
51affb8839
Replace util.NormalizeImageRef with reference.ParseDockerRef 
Using the utility caused other project to have containerd/cri
as a dependency, only for this utility. The new `reference.ParseDockerRef`
function does the same (it's a copy of this function).

Tests were kept for now, but could be removed in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-07 13:22:58 +01:00
Sebastiaan van Stijn
0ad60d4d9e
Bump docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-07 13:02:37 +01:00
Lantao Liu
7c2498d2e6
Merge pull request #1037 from Random-Liu/support-unknown-state 
Support unknown state
 2019-02-05 14:06:24 -08:00
Lantao Liu
c27a12dd08 Update containerd to 5ba368748b. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-05 11:56:24 -08:00
Lantao Liu
f8b3450847 Add integration test for unknown state 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-05 11:56:24 -08:00
Lantao Liu
83af4dad87 Support unknown state for sandbox and container 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-05 11:56:24 -08:00
Lantao Liu
4dc6f6d0b5 Add state machine for sandbox and container 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-05 11:56:24 -08:00