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
Lantao Liu
3d382e2f5d
Merge pull request #632 from jcvenegas/tests-find-containerd-path 
tests: Use path found to containerd.
 2018-03-02 00:06:47 -08:00
Jose Carlos Venegas Munoz
ec05357463 tests: Use path found to containerd. 
After check if containerd is intalled the command executed using sudo,
/usr/local/bin may not been in sudo secure_path, save the path where
containerd was installed and use it.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
 2018-03-01 21:50:49 -06:00
Lantao Liu
e186ef835d
Merge pull request #631 from Random-Liu/expose-cri-version 
Expose cri version for CRI plugin.
 2018-02-28 19:40:39 -08:00
Lantao Liu
36b4c05354 Report containerd version instead of cri-containerd version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-01 01:26:37 +00:00
Lantao Liu
e4dd7c2e58 Expose cri version for CRI plugin. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-28 23:39:58 +00:00
Lantao Liu
30b840d620
Merge pull request #629 from mikebrow/golang-version-change 
moving to go1.10 only
 2018-02-28 13:21:28 -08:00
Mike Brown
c912afd7a9 moving to go1.10 only 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-28 10:39:10 -06:00
Lantao Liu
33851eb2c5
Merge pull request #618 from Random-Liu/add-generic-restart-test 
Add generic restart test
 2018-02-27 13:42:27 -08:00
Lantao Liu
e43def70c1 Fix travis test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-27 19:33:41 +00:00
Lantao Liu
31c377db6d Update containerd to 25c403415a. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-27 19:33:41 +00:00
Lantao Liu
09294fca40 Add generic restart test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-27 18:21:09 +00:00
Lantao Liu
00cd5b6a0c
Merge pull request #621 from mikebrow/golang-sync-with-containerd 
adds go 1.10 to ci test
 2018-02-27 10:12:00 -08:00
Lantao Liu
1617181196
Merge pull request #625 from Random-Liu/enable-log-rotation 
Enable container log rotation.
 2018-02-27 10:11:03 -08:00
Mike Brown
af818b7dcf
Merge pull request #622 from Random-Liu/update-support-matrix 
Update support matrix.
 2018-02-27 09:45:52 -06:00
Mike Brown
9810257487 adds go 1.10 to ci test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-27 07:26:18 -06:00
Lantao Liu
ae7303dfbf Enable container log rotation. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-27 10:44:32 +00:00
Lantao Liu
b450950d54 Update support matrix. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-27 07:48:16 +00:00
Lantao Liu
820735456c
Merge pull request #620 from Random-Liu/update-cri-tools 
Update critools to b184f9aefe60a4441330e615ee20634ee26474fb.
 2018-02-26 10:34:27 -08:00
Lantao Liu
0c06677a08 Update critools to b184f9aefe60a4441330e615ee20634ee26474fb. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-25 11:41:33 +00:00
Lantao Liu
c9081b2ec0
Merge pull request #617 from Random-Liu/fix-potential-panic 
Fix a potential panic
 2018-02-21 23:36:51 -08:00
Lantao Liu
f5390d01d6 Fix a potential panic 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-22 03:17:16 +00:00
Lantao Liu
7f5687c801
Merge pull request #616 from Random-Liu/run-cri-in-parallel 
Update critools and run critest in parallel.
 2018-02-21 16:11:46 -08:00
Lantao Liu
8c41634bae
Merge pull request #615 from Random-Liu/use-containerd-cli 
Use containerd cli for CI
 2018-02-21 15:05:18 -08:00
Lantao Liu
fd32f5b8a5 Update critools and run critest in parallel. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-21 22:31:11 +00:00
Lantao Liu
cc2726054d Add test-containerd for plugin mode test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-21 22:21:48 +00:00
Lantao Liu
45b6e75803 Update containerd to 129167132c. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-21 02:52:57 +00:00
Lantao Liu
454f583d49
Merge pull request #600 from mikebrow/cleanup-hack-versions 
removes hack versions; splits update vendor into optional sort and sync operations
 2018-02-14 16:42:55 -08:00
Mike Brown
84139b4241 removes hack versions; splits update vendor and makes it optional 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-14 16:37:49 -06:00
Lantao Liu
460eed77ef
Merge pull request #611 from Random-Liu/fix-shutdown 
Do not block on stream server close.
 2018-02-14 14:09:56 -08:00
Lantao Liu
561d045d71
Merge pull request #612 from Random-Liu/health-monitor-initial-wait 
Add initial wait for health-monitor and use pkill -x.
 2018-02-14 11:36:45 -08:00
Lantao Liu
9b2d2a203c Add initial wait for health-monitor and use pkill -x. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-14 18:51:22 +00:00
Lantao Liu
6d538ccbf6 Do not block on stream server close. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-14 08:41:29 +00:00
Lantao Liu
df461c0d48
Merge pull request #609 from Random-Liu/support-reopen-container-log 
Support reopening container log.
 2018-02-13 10:51:22 -08:00
Lantao Liu
a8264ec035 Support reopening container log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-13 17:57:45 +00:00
Lantao Liu
8357315564
Merge pull request #608 from mikebrow/relax-author-case-sensitivity 
adds lower case containerd to the list of authors
 2018-02-09 15:21:16 -08:00
Mike Brown
dd1682c84e adds lower case containerd to the list of authors 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-09 11:02:59 -06:00
Lantao Liu
50c7aac41f
Merge pull request #607 from Random-Liu/no-cni-fastbuild 
Do not fast build.
 2018-02-09 01:51:32 -08:00
Lantao Liu
944958722c
Merge pull request #601 from Random-Liu/support-new-cri-storage-id 
Support new cri storage
 2018-02-09 01:03:32 -08:00
Lantao Liu
09aff83bdd Do not fast build. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-09 08:53:26 +00:00
Lantao Liu
6900cbdada Use mountpoint as image fs identifier. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-09 07:46:49 +00:00
Lantao Liu
a555bc25b9 Update kubernetes 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-09 07:42:54 +00:00
Lantao Liu
3dbc24a701
Merge pull request #605 from mikebrow/runc-update 
update runc vendor
 2018-02-08 17:42:34 -08:00
Mike Brown
6e1c57ec01 update runc vendor and containerd 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-08 19:01:48 -06:00
Lantao Liu
4f4d89da58
Merge pull request #556 from ijc/hack-versions 
hack/versions: extract most from vendor.conf
 2018-02-08 13:37:14 -08:00
Lantao Liu
f2e8497426
Merge pull request #606 from Random-Liu/remove-reset 
kubeadm has supported reset with crictl.
 2018-02-08 11:26:24 -08:00
Lantao Liu
4dec156418
Merge pull request #604 from Random-Liu/fix-kube-up-env 
The ENV is finalized as KUBE_KUBELET_EXTRA_ARGS.
 2018-02-08 11:25:11 -08:00
Lantao Liu
a904f47c76 The ENV is finalized as KUBE_KUBELET_EXTRA_ARGS. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 18:48:46 +00:00
Lantao Liu
f2cb57d441 kubeadm has supported reset with crictl. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 18:47:27 +00:00
Ian Campbell
f6dd8c9e52 hack/versions: extract most from vendor.conf 
This sets `$what_VERSION` and `$what_REPO` for runc, cni, containerd and
kubernetes based on vendor.conf, removing the need to duplicate things in
hack/versions.

With this `update_hack_versions` becomes redundant so remove it and both calls.

Since CONTAINERD_REPO is now unconditionally set we can also simplify the
fetching of vendor.conf in update-vendor.sh a bit, so do so. Further since
`*_REPO` are now unconditionally set we can support alternative clone paths for
all of these repos by adjusting checkout_repo to make the 3rd argument
non-optional and always passing it. Since `CRITOOL_VERSION` is not coming from
`vendor.conf` (since it is not used from Go code) we manually set
`CRITOOL_REPO` for consistency.

The final wrinkle is that `k8s.io/kubernetes` is has a Go specific redirect in
the form of HTML meta headers returned from https://k8s.io/kubernetes/?go-get=1
which point to the real repo to clone. Parsing that in shell is tricky so just
hardcode that.

Fixes #540.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2018-02-08 13:47:46 +00:00
Lantao Liu
5e7347db53
Merge pull request #603 from Random-Liu/support-shared-pid 
Support shared pid
 2018-02-07 22:12:27 -08:00