Commit Graph

1444 Commits

Author SHA1 Message Date
Lantao Liu
a69f3555da Add build-containerd.sh to build containerd from existing repo
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-16 17:51:29 +00:00
Lantao Liu
0b8e9060d7 Sync vendors with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-16 06:39:01 +00:00
Lantao Liu
1dcbf4f742
Merge pull request #663 from abhi/cni
Moving to use go-cni library from containerd
2018-03-15 17:53:50 -07:00
Lantao Liu
5e5a5f50d1
Merge pull request #671 from Random-Liu/ctrcri-to-ctr-cri
Ctrcri to ctr cri
2018-03-15 17:14:59 -07:00
abhi
a1f4516661 Vendoring changes
Signed-off-by: abhi <abhi@docker.com>
2018-03-15 17:05:36 -07:00
abhi
003bbd4292 Modifying fake cni plugin
Signed-off-by: abhi <abhi@docker.com>
2018-03-15 17:05:33 -07:00
Lantao Liu
1eaef9ee10
Merge pull request #669 from Random-Liu/cleanup-event-backoff
Cleanup event backoff.
2018-03-15 16:28:59 -07:00
Lantao Liu
45f4037d3d
Merge pull request #670 from Random-Liu/enable-promic-mode
Enable promisc mode because Kubernetes network model needs it.
2018-03-15 16:27:54 -07:00
Lantao Liu
7e67d96b9b Replace ctrcri with ctr cri.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-15 23:22:00 +00:00
Lantao Liu
62d1f13217 Update containerd to 3c1ef1a714
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-15 23:21:32 +00:00
Lantao Liu
b82ca71b61 Enable promisc mode because Kubernetes network model needs it.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-15 22:21:10 +00:00
Lantao Liu
d389af83a9 Cleanup event backoff.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-15 18:49:36 +00:00
Lantao Liu
eff311d493
Merge pull request #628 from yanxuean/nits
Handle containerd event reliably
2018-03-15 11:35:59 -07:00
yanxuean
c751847350 Handle containerd event reliably
fix #434

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2018-03-15 17:14:02 +08:00
yanxuean
7583bce4ab some comments
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2018-03-15 15:55:54 +08:00
abhi
92110e1d74 Moving to use go-cni library from containerd
This fix aims to use the cni library form containerd.
The library avoid usage of nsenter.

Signed-off-by: abhi <abhi@docker.com>
2018-03-14 19:25:54 -07:00
Lantao Liu
0c87604068
Merge pull request #630 from Random-Liu/add-cli-package
Add CLI package for `ctr` to use.
2018-03-13 17:51:50 -07:00
Lantao Liu
22b1d526ce Add CLI package for ctr to use.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-13 23:51:45 +00:00
Lantao Liu
582975a903
Merge pull request #661 from mikebrow/rename-cri-containerd
renames cri-containerd to cri
2018-03-13 16:48:30 -07:00
Mike Brown
d4e7154625 move links for cri-containerd to cri
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-13 17:06:26 -05:00
Lantao Liu
135f667963
Merge pull request #658 from Random-Liu/direct-function-call
Direct function call
2018-03-13 10:26:58 -07:00
Lantao Liu
122909844e
Merge pull request #651 from miaoyq/add-doc-for-registry-config
Add document about registry configuration
2018-03-12 21:57:07 -07:00
Lantao Liu
f0a500a390 Use direct function call.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-13 04:51:19 +00:00
Lantao Liu
edb38dfecc Update containerd to 3013762fc5
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-13 04:41:11 +00:00
Lantao Liu
80b2f751d3
Merge pull request #654 from stevvooe/simplify-stopch
pkg/store: use a sync.Once to synchronize channel close
2018-03-09 15:29:32 -08:00
Lantao Liu
e20c6eb8a8
Merge pull request #558 from Random-Liu/report-containerd-version
Report containerd version instead of cri-containerd version.
2018-03-09 15:25:32 -08:00
Stephen J Day
4ed26f3116
pkg/store: use a sync.Once to synchronize channel close
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-09 14:43:16 -08:00
Yanqiang Miao
4a8060f08b Add document about registry configuration
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-03-08 11:02:57 +08:00
Abhinandan Prativadi
1f28f8d2fe
Merge pull request #650 from Random-Liu/fix-resolver
Handles 401 in resolver.
2018-03-07 10:59:43 -08:00
Lantao Liu
5b3895932f
Merge pull request #648 from Random-Liu/fix-context
Fix cleanup context.
2018-03-07 00:03:59 -08:00
Lantao Liu
40c8372f0e Handles 401 in resolver.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-07 07:35:02 +00:00
Lantao Liu
f01c6d73a6 Fix cleanup context.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-07 07:05:27 +00:00
Mike Brown
c3574e4493 makes copyright year optional
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-06 15:55:32 -06:00
Abhinandan Prativadi
ffda916fd0
Merge pull request #641 from Random-Liu/fix-ansible-doc
Require ansible 2.4+.
2018-03-05 21:39:22 -08:00
Lantao Liu
d3b112a989
Merge pull request #639 from Random-Liu/remove-standalone-mode
Remove standalone mode
2018-03-05 17:23:06 -08:00
Lantao Liu
640e7ac2b0 Update ansible setup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-06 00:05:02 +00:00
Lantao Liu
936dcceb5a Update GCE cluster bootstrapping and e2e test
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-06 00:05:02 +00:00
Lantao Liu
f24be111ab
Merge pull request #643 from Random-Liu/events-panic
Fix a potential panic.
2018-03-05 15:13:23 -08:00
Lantao Liu
9a097c9d34
Merge pull request #640 from mikebrow/crictl-load-description
documents load image
2018-03-05 14:36:48 -08:00
Lantao Liu
ceb540d823 Fix potential panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 22:09:58 +00:00
Mike Brown
ffea684c57 documents load image
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-05 15:57:44 -06:00
Lantao Liu
760248df77 Require ansible 2.4+.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:51:59 +00:00
Lantao Liu
05bcc3e88c Update makefile and all integration test
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:45:20 +00:00
Lantao Liu
d1e9960180 Remove standalone mode
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:45:20 +00:00
Lantao Liu
64b098a293
Merge pull request #636 from Random-Liu/fix-default-config
Only overwrite when legacy options are specified.
2018-03-02 17:51:38 -08:00
Lantao Liu
f8fa536ff7
Merge pull request #635 from mikebrow/travis-golang-fix
fix travis golang issue
2018-03-02 17:51:25 -08:00
Lantao Liu
ef5b9d1e16 Only overwrite when legacy options are specified.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-03 01:03:34 +00:00
Mike Brown
8364abc0f3 fix travis golang issue
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-02 18:50:26 -06:00
Lantao Liu
ba6503870f
Merge pull request #637 from mikebrow/missing-tag
adds allways to ensure there is a version even if no tag
2018-03-02 16:16:03 -08:00
Mike Brown
d371d403b4 adds allways to ensure there is a version even if no tag
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-02 17:15:42 -06:00