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
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
Lantao Liu
532a895d7d Update critest. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 03:10:57 +00:00
Lantao Liu
46fc92f65f Use new namespace mode and support shared pid namespace. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 03:10:57 +00:00
Lantao Liu
605b4a7b6a Update imports 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 02:45:44 +00:00
Lantao Liu
ae85d0ee81 Update kubernetes to 0caa20c65f147e15f5545862510eb7e81c42b0a3. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 02:45:44 +00:00
Lantao Liu
047df7aca6
Merge pull request #602 from mikebrow/critools-install-minor-update 
update critools
 2018-02-07 18:44:37 -08:00
Mike Brown
edb2b2379d change crictl sandboxes to pods; other references to sandboxes 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-07 17:23:59 -06:00
Lantao Liu
2acd6c1a5c
Merge pull request #599 from Random-Liu/update-ocicni 
Update ocicni to main stream.
 2018-02-07 13:47:12 -08:00
Lantao Liu
f36a8bf2ba
Merge pull request #598 from Random-Liu/use-containerd-log-trace 
Use containerd log trace
 2018-02-07 13:47:01 -08:00
Mike Brown
f19cd8ad67 update critools 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-07 13:47:23 -06:00
Lantao Liu
caf2bdb04a Update ocicni to main stream. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-07 19:39:06 +00:00
Lantao Liu
8925ef90be Use trace support in containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-07 19:17:26 +00:00
Lantao Liu
b776e696bd Update containerd 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-07 19:17:26 +00:00
Lantao Liu
2fa185c09f
Merge pull request #596 from Random-Liu/remove-wrong-comment 
Remove wrong comment. CRI is actually a grpc plugin of containerd now.
 2018-02-06 13:32:43 -08:00
Lantao Liu
447c2284cf Remove wrong comment. CRI is actually a grpc plugin of containerd now. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-06 00:45:32 +00:00
Lantao Liu
78f3df285f
Merge pull request #595 from Random-Liu/no-critest-in-release 
Remove critest from release tarball.
 2018-02-05 15:39:12 -08:00
Lantao Liu
5740e94338 Remove critest from release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-05 22:21:10 +00:00
Lantao Liu
f4625ef76c
Merge pull request #593 from Random-Liu/fix-ocicni-commit 
I rebased my ocicni fork, and ruin the previous commit...
 2018-02-04 12:14:26 -08:00
Lantao Liu
9f49134cc0 I rebased my fork, and ruin the previous commit... 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-03 00:58:54 +00:00