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

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Day
ee6ffdd91e
Merge pull request #2116 from crosbymichael/bump-runc 
Update runc to a618ab5a0186905949ee463dbb762c3d23e
 2018-02-08 15:09:43 -08: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
Derek McGowan
57011c5b89
Merge pull request #2114 from crosbymichael/stress-errors 
Capture more error locations during stress tests
 2018-02-08 10:58:17 -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
Michael Crosby
5ae204ff65
Merge pull request #2115 from justincormack/fallthrough 
Remove a really confusing fallthrough
 2018-02-08 11:38:13 -05:00
Michael Crosby
73837b11db Update runc to a618ab5a0186905949ee463dbb762c3d23e 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-08 11:30:24 -05:00
Justin Cormack
35be3d5127 Remove a really confusing fallthrough 
This is so confusing, and not needed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2018-02-08 16:22:29 +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
Akihiro Suda
80e6bbfc5d
Merge pull request #2113 from cpuguy83/use_continuity_copy 
Use continuity fs package
 2018-02-08 08:49:34 +09: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
Michael Crosby
e68bdbe9d9 Capture more error locations during stress tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-07 15:50:29 -05: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
Brian Goff
c776b6d8d9 Use continuity fs package 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-02-07 12:40:52 -05:00
Michael Crosby
f12ba2407e
Merge pull request #2111 from Random-Liu/fix-trace-level 
Fix trace level support.
 2018-02-07 10:38:32 -05:00
Phil Estes
85a66da055
Merge pull request #2105 from Random-Liu/support-disable-plugins 
Support disable plugins.
 2018-02-07 06:34:47 +00:00
Lantao Liu
f2c585a59a Fix trace level support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-07 01:14:05 +00:00
Lantao Liu
eee592c3ac Support disable plugins. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-06 23:39:44 +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
Derek McGowan
424c0fb59d
Merge pull request #2075 from hinshun/converter-mediatypes 
Allow specifying media type for a converted schema1 manifest for compatibility with distribution
 2018-02-06 10:58:16 -08:00
Stephen Day
0d9995e6e2
Merge pull request #2109 from crosbymichael/onclose 
Use ttrpc OnClose to fix restored dead shims
 2018-02-06 10:57:29 -08:00
Michael Crosby
95d4f53fbe Delete task on dead shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-06 12:46:06 -05:00
Michael Crosby
e92c913ea5
Merge pull request #2106 from Random-Liu/add-trace-level-support 
Support trace level.
 2018-02-06 11:03:52 -05:00
Michael Crosby
87d15a5ffc Set OnClose shim function 
When restoring a task make sure that dead shims are handled.

Fixes #2078

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-06 10:45:50 -05:00
Michael Crosby
9745a4d448 Update ttrpc to d4528379866b0ce7e9d71f3eb96f0582fc 
Contains the OnClose method for the client

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-06 10:27:36 -05:00
Lantao Liu
050ff32dea Support trace level. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-06 02:30:05 +00: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
Stephen Day
aa49e704e2
Merge pull request #2095 from dmcgowan/fix-whiteout-parent-directories 
archive: fixes missing whiteout parent directories
 2018-02-05 11:26:17 -08:00
Michael Crosby
1a4f609526
Merge pull request #2098 from dankohn/master 
Change name of LICENSE
 2018-02-05 10:08:13 -05:00
Dan Kohn
48d27e4e74 Change name of LICENSE 
This will allow GitHub's License API to properly classify containerd as Apache
https://developer.github.com/v3/licenses/

Signed-off-by: Dan Kohn <dan@dankohn.com>
 2018-02-05 09:46:28 -05:00
Michael Crosby
ae3c72c853
Merge pull request #2099 from tkporter/master 
Add time type conversions for 32bit Unix platforms
 2018-02-05 09:19:58 -05:00
Michael Crosby
78bd07afef
Merge pull request #1746 from AkihiroSuda/split-differ-interface 
diff: resplit Applier from Differ
 2018-02-05 09:18:56 -05:00
Michael Crosby
13733b6a65
Merge pull request #2100 from kunalkushwaha/testsuite-typo-fix 
Testcase name corrected
 2018-02-05 09:11:41 -05:00
Michael Crosby
549ec7b9dd
Merge pull request #2091 from crosbymichael/shim-size 
Shim optimizations for size and cpu
 2018-02-05 09:10:56 -05:00
Kunal Kushwaha
1d6047aa71 Testcase name corrected 
checkUploadStatus actaully verifys contents on Updating already written buffers,
hence should be called as checkUpdateStatus

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2018-02-05 11:12:12 +09:00