github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
1,141 Commits 3 Branches 2 Tags 112 MiB
450eb09a68
Commit Graph

192 Commits

Author SHA1 Message Date
Lantao Liu
9f8e58123b
Merge pull request #647 from mikebrow/boiler-support-for-no-year 
makes copyright year optional
 2018-05-16 17:10:01 -07:00
Lantao Liu
9763489008 Upgrade cri-tools to v1.0.0-beta.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-14 19:29:52 -07:00
Lantao Liu
2f370f6f5d Update cri-tools to fix crictl logs output. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-26 19:17:45 -07:00
Lantao Liu
e0d7078251 Fix tarball ownership and containerd binary path for containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-24 13:05:31 -07:00
Lantao Liu
e22ebf420f Down containerd binaries from official release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-24 01:23:44 -07:00
Lantao Liu
06f53b4838 Add unix:// prefix for socket addresses used by CRI remote client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-20 17:36:25 -07:00
Lantao Liu
ba9b075683
Merge pull request #740 from Random-Liu/improve-gce-bootstrap 
Improve gce bootstrapping in various ways.
 2018-04-18 14:12:27 -07:00
Lantao Liu
72ade6c4f5 Remove 10-containerd-net.conflist from cri-containerd-cni release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
b2ebb735e7 Improve gce bootstrapping in various ways. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
d970636147 Update CRI validation test to include hostnet portforward test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-17 19:19:03 -07:00
Lantao Liu
334f7ddf0a Update cri test to include RunAsGroup test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-02 21:29:09 +00:00
Lantao Liu
c4f80aecb7
Merge pull request #711 from tklauser/libapparmor-dep 
Drop libapparmor dependency from build docs
 2018-04-02 11:55:27 -07:00
Tobias Klauser
d29678a3c4 Drop libapparmor dependency from build docs 
As of opencontainers/runc@db093f6 runc no longer depends on libapparmor
thus libapparmor-dev no longer needs to be installed to build it or
anythind that depends on it (like containerd or cri-containerd). Adjust
the documentation accordingly.

containerd/containerd#2238 did the same for containerd.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2018-03-31 18:18:12 +02:00
Lantao Liu
bb480ceabd Update cri-tools, containerd and kubernetes version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-28 00:45:01 +00:00
Lantao Liu
c6fecb2115
Merge pull request #688 from Random-Liu/cleanup-kata-code 
Address comments for privileged runtime code.
 2018-03-22 23:01:31 -07:00
Lantao Liu
ca67f94ee0 Address comments for privileged runtime code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-23 02:17:46 +00:00
Mike Brown
89adb74414 adds tls certificate to tls config 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-22 09:42:31 -05:00
Lantao Liu
cf156144bc
Merge pull request #657 from jcvenegas/trusted-runtime 
[WIP]config: Allow to define trusted runtime
 2018-03-20 19:21:04 -07:00
Lantao Liu
f3b8e72998
Merge pull request #685 from Random-Liu/update-cri-tools 
Update cri-tools and build critest into release tarball again.
 2018-03-20 19:08:18 -07:00
Jose Carlos Venegas Munoz
536b381362 test: Allow change containerd config 
Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
 2018-03-20 18:05:40 -06:00
Lantao Liu
36768a1920 Update cri-tools and build critest into release tarball again. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-20 21:26:05 +00:00
Lantao Liu
904938fa9d Fix for kube-up.sh and update several documments. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-20 09:24:15 +00:00
Lantao Liu
387da59ee5 Rename all variables to remove "cricontainerd". 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-19 21:59:32 +00:00
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
5e5a5f50d1
Merge pull request #671 from Random-Liu/ctrcri-to-ctr-cri 
Ctrcri to ctr cri
 2018-03-15 17:14:59 -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
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
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
Mike Brown
c3574e4493 makes copyright year optional 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-06 15:55:32 -06: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
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
31c377db6d Update containerd to 25c403415a. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-27 19:33:41 +00: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
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
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
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
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
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
09aff83bdd Do not fast build. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-09 08:53:26 +00: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
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
532a895d7d Update critest. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 03:10:57 +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
Mike Brown
f19cd8ad67 update critools 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-07 13:47:23 -06:00