github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
976 Commits 3 Branches 2 Tags 112 MiB
22b1d526ce
Commit Graph

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
62e6921145 Use containerd grpc server 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 18:51:18 +00:00
Lantao Liu
87f73a6b5d
Merge pull request #554 from Random-Liu/minor-cleanup 
Minor code cleanup.
 2018-01-18 10:29:21 -08:00
Lantao Liu
6fadb7f5e9 Minor code cleanup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 07:31:16 +00:00
Lantao Liu
ca3b73899a
Merge pull request #547 from Random-Liu/glog-to-logrus 
glog to logrus
 2018-01-17 19:26:31 -08:00
Lantao Liu
144ff3989b Update all glog flags to log-level. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
3d68005c04 Replace glog with logrus 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
383a89b948 Add flags and utils for logrus 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
57323b2e64
Merge pull request #546 from jcvenegas/pod-annotations 
Annotations: Provide container metadata for VM based runtimes
 2018-01-17 10:24:51 -08:00
Jose Carlos Venegas Munoz
b383b0261a Annotations: Provide container metadata for VM based runtimes 
For hypervisor-based container runtimes (like Kata Containers, Clear Containers
or runv) a pod will be created in a VM and then create containers within the VM.

When a runtime is requested for container commands like create and start, both
the instal "pause" container and next containers need to be added to the pod
namespace (same VM).

A runtime does not know if it needs to create/start a VM or if it needs to add a
container to an already running VM pod.

This patch adds a way to provide this information through container annotations.
When starting a container or a sandbox, 2 annotations are added:

- type (Container or Sandbox)
- sandbox name

This allow to a VM based runtime to decide if they need to create a pod VM or
container within the VM pod.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
 2018-01-17 09:57:20 -06:00
Lantao Liu
f0c001afa4
Merge pull request #527 from Random-Liu/add-plugin-mode 
Add initial version of plugin mode
 2018-01-16 11:03:49 -08:00
Lantao Liu
15940c9319 Add travis integration test for plugin mode. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-15 06:54:55 +00:00
Lantao Liu
794543065a Add script to automatically update containerd with newest cri plugin. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-15 06:54:55 +00:00
Lantao Liu
bd9e9ce56e Add containerd plugin mode. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-15 06:54:55 +00:00
Lantao Liu
44cb406bb4
Merge pull request #544 from Random-Liu/update-containerd 
Update containerd
 2018-01-12 15:41:34 -08:00
Lantao Liu
48b2d1c806
Merge pull request #543 from mikebrow/readme-containerd-view 
update readme after move to containerd
 2018-01-12 15:03:24 -08:00
Lantao Liu
cdb1bf0946 Use new cio package. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-12 22:35:24 +00:00
Lantao Liu
b07017b93e Update containerd version to 90553efdef. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-12 22:34:39 +00:00
Mike Brown
d875b6ecef update readme after move to containerd 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-01-12 16:18:38 -06:00
Lantao Liu
d23853e60e
Merge pull request #541 from Random-Liu/skip-node-e2e 
Skip node e2e test in travis.
 2018-01-12 10:43:14 -08:00
Lantao Liu
00c1477c87 Remove node e2e test in travis. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-12 06:30:43 +00:00
Lantao Liu
bd8b63a993
Merge pull request #536 from mikebrow/boilerplate-upgrade 
enhanced boilerplate checking
 2018-01-11 21:18:02 -08:00
Mike Brown
bf157d2fe5 enhanced boilerplate checking 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-01-11 19:59:34 -06:00
Lantao Liu
f35b5924aa
Merge pull request #535 from Random-Liu/remove-reexec 
Remove reexec usage
 2018-01-11 17:29:41 -08:00
Lantao Liu
df1b027cce
Merge pull request #532 from mikebrow/docs-move-repo-update 
fix kubernetes-incubator links
 2018-01-11 17:01:46 -08:00
Lantao Liu
859fb747d2
Merge pull request #538 from Random-Liu/improve-update-vendor 
Change hack/update-vendor.sh to sync again with new vendor
 2018-01-11 16:32:26 -08:00
Mike Brown
07c8f07ba3 fix kubernetes-incubator links 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-01-11 17:50:57 -06:00
Lantao Liu
81893b70e6 Change hack/update-vendor.sh to sync again with new vendor 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 23:22:39 +00:00
Lantao Liu
8e836140bd
Merge pull request #537 from Random-Liu/fix-install-deps 
Pass PATH for containerd sudo make install.
 2018-01-11 15:18:03 -08:00
Lantao Liu
1f6f0c7b9a Pass PATH for containerd sudo make install. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 22:37:14 +00:00
Lantao Liu
8782f18d50 Add integration test for volume copy up. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 19:10:52 +00:00
Lantao Liu
3d72cb857a Update vendor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 19:10:41 +00:00
Lantao Liu
54b3b4e0b0 Use graphdriver/copy instead of chrootarchive 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 19:10:11 +00:00
Lantao Liu
cd255e6ac4
Merge pull request #533 from Random-Liu/rename-org 
Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.
 2018-01-10 15:55:12 -08:00
Lantao Liu
025ffe551f Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-10 22:35:33 +00:00
Lantao Liu
5bfa5e451a
Merge pull request #528 from cpuguy83/skip_selinux_test 
Minor cleanup on selinux test
 2018-01-09 16:30:41 -08:00
Brian Goff
2a07847d67 Use t.Run() instead of t.Log() for subtest log 
Signed-off-by: Brian Goff <brian.goff@docker.com>
 2018-01-09 15:45:13 -05:00
Brian Goff
96484eb3e7 Use t.Skip() when selinux is not enabled 
Signed-off-by: Brian Goff <brian.goff@docker.com>
 2018-01-09 15:43:56 -05:00
Lantao Liu
f6437b44c4
Merge pull request #510 from Random-Liu/do-not-exit 
Do not error out if uuid is not found.
 2018-01-08 11:41:26 -08:00
Lantao Liu
dca05358dc Add flag to skip imagefs uuid related logic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-08 18:41:13 +00:00
Lantao Liu
896cbd70f7
Merge pull request #526 from yujuhong/fix-link 
Fix typos and broken links in docs
 2018-01-05 11:37:50 -08:00
Yu-Ju Hong
07a0685499 Fix typos and broken links in docs 
Signed-off-by: Yu-Ju Hong <yjhong@google.com>
 2018-01-05 10:44:13 -08:00
Lantao Liu
aee7a366f3
Merge pull request #525 from abhi/cniip 
Caching IP allocated by CNI plugin
 2018-01-05 00:27:48 -08:00
Lantao Liu
360e8623ce
Merge pull request #523 from Random-Liu/compare-vendors 
Sync vendors with containerd
 2018-01-04 22:39:18 -08:00
abhi
f1dbc0b375 Caching IP allocated by CNI plugin 
Signed-off-by: abhi <abhi@docker.com>
 2018-01-04 20:00:55 -08:00
Lantao Liu
141f57065c Update vendors out of sync 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-05 01:17:45 +00:00
Lantao Liu
2b2011dafa Add script to sync vendors with containerd 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-05 01:17:45 +00:00
Lantao Liu
bc774a9108
Merge pull request #522 from Random-Liu/refactor-hack-utils 
Refactor hack utils
 2018-01-04 11:00:00 -08:00
Lantao Liu
e66e6d98df Add hack/utils.sh. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-04 18:22:12 +00:00
Lantao Liu
ca2c92e512
Merge pull request #521 from Random-Liu/fix-install-deps 
Fix install-deps
 2018-01-04 01:08:57 -08:00
Lantao Liu
b3a4141ce5
Merge pull request #519 from Random-Liu/fix-vendor 
Add missing vendor into vendor.conf.
 2018-01-03 23:27:16 -08:00