Commit Graph

168 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
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
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
Lantao Liu
b776e696bd Update containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:17:26 +00: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 J Day
680bafea76
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-02 11:53:48 -08:00
Lantao Liu
a28672b088 Update containerd to fix mount.Lookup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:27:15 +00:00
Lantao Liu
23e872a44d Update containerd to ec15fe95aa.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-29 18:44:16 +00:00
Lantao Liu
635e5747c0 Update containerd and leverage plugin graceful stop.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 22:46:46 +00:00
Lantao Liu
dd125be836 Update containerd to 4812f4be8f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 00:08:27 +00:00
Lantao Liu
4e9ca399e1 Use containerd plugin config.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-19 02:25:03 +00:00
Lantao Liu
a9d846af23 Upgrade test framework to talk to containerd sock.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 18:51:18 +00:00
Lantao Liu
144ff3989b Update all glog flags to log-level.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +00:00
Lantao Liu
794543065a Add script to automatically update containerd with newest cri plugin.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-15 06:54:55 +00:00
Lantao Liu
b07017b93e Update containerd version to 90553efdef.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-12 22:34:39 +00:00
Lantao Liu
bd8b63a993
Merge pull request #536 from mikebrow/boilerplate-upgrade
enhanced boilerplate checking
2018-01-11 21:18:02 -08:00
Mike Brown
bf157d2fe5 enhanced boilerplate checking
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-01-11 19:59:34 -06:00
Lantao Liu
81893b70e6 Change hack/update-vendor.sh to sync again with new vendor
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-11 23:22:39 +00:00
Lantao Liu
1f6f0c7b9a Pass PATH for containerd sudo make install.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-11 22:37:14 +00:00
Lantao Liu
2b2011dafa Add script to sync vendors with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-05 01:17:45 +00:00
Lantao Liu
e66e6d98df Add hack/utils.sh.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-04 18:22:12 +00:00
Lantao Liu
d361ee5422 Fix install-deps
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-04 07:05:31 +00:00
Lantao Liu
b883157072
Merge pull request #508 from Random-Liu/update-kubernetes
Update kubernetes to v1.9.0.
2017-12-15 17:01:58 -08:00
Lantao Liu
93519cd85c
Merge pull request #505 from Random-Liu/update-containerd
Update containerd to 6c7abf7c76c1973d4fb4b0bad51691de84869a51.
2017-12-15 16:14:42 -08:00
Lantao Liu
498562022d Update kubernetes to v1.9.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-15 23:44:23 +00:00
Lantao Liu
ea6abcc1d7 Use sha256 instead of sha1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-15 20:12:46 +00:00
Lantao Liu
282e906b5c Update containerd to 6c7abf7c76c1973d4fb4b0bad51691de84869a51.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-15 19:51:02 +00:00