Commit Graph

213 Commits

Author SHA1 Message Date
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
Lantao Liu
04333d0532
Merge pull request #502 from miaoyq/part-of-385
Compare vendor with hack/versions and update hack/versions
2017-12-15 11:24:11 -08:00
Yanqiang Miao
0520ebc67a Compare vendor with hack/versions and update hack/versions
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-12-15 12:11:07 +08:00
Lantao Liu
4396f1d666 Update cri-tools to v1.0.0-alpha.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-14 19:33:45 +00:00
Lantao Liu
ec975b2e7a Add OS and arch in release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-13 23:03:03 +00:00
Lantao Liu
a0aa5fd7df
Merge pull request #490 from Random-Liu/cleanup-kube-up
Cleanup kube up
2017-12-12 16:39:47 -08:00
Lantao Liu
3f008a9353 Add cluster directory and health-monitor.sh.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-12 08:38:52 +00:00
Lantao Liu
5003c61849
Merge pull request #480 from miaoyq/fix-466
Switch to a tmp GOPATH for `make install.deps`
2017-12-12 02:24:14 -06:00
Yanqiang Miao
ea88668f1c Switch to a tmp GOPATH for make install.deps
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-12-12 14:35:41 +08:00
Lantao Liu
f4c572fba7 Add restart test for sandbox recovery.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-11 21:21:08 +00:00
Lantao Liu
28f3639e14 Update cri-tools.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-07 02:59:43 +00:00
Lantao Liu
db5563abd3 Update containerd to v1.0.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-06 04:06:00 +00:00
Lantao Liu
12a71882db Add support to install from alternative repo
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-04 19:18:45 +00:00
Lantao Liu
0d8298aa43 Update containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-04 19:18:45 +00:00
Lantao Liu
562eb725c7
Merge pull request #458 from mikebrow/boilerplate-update
fixes for boilerplate
2017-12-04 10:03:41 -08:00
Lantao Liu
e0e5d9e139 Update containerd to try fix rootfs issue.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-02 00:09:04 +00:00
Mike Brown
009e40f280 correct some boilerplates
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-01 16:56:25 -06:00
Mike Brown
4c7974fe97 fixes for boilerplate
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-01 16:55:30 -06:00
Lantao Liu
b47770eaee Update containerd to fix fd leakage.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 00:24:44 +00:00
Lantao Liu
5ed43ea1a3 Update containerd to fix long exec issue.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-30 19:24:14 +00:00
Lantao Liu
5f0fba4204 Update containerd and add synchronous image deletion.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-28 22:44:25 +00:00
Daniel Nephin
85d3bf0660 Use SpecOpts from new oci package
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-28 15:30:11 -05:00
Lantao Liu
2e3c510c92 Update containerd to 70e0c8443f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-27 19:24:14 +00:00
yanxuean
50cb8a0571 update containerd for refactor
fix #423

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-27 19:24:14 +00:00
Lantao Liu
f6bc65bf7a Update kubernetes version in hack/versions
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-22 18:46:15 +00:00
Lantao Liu
cb0d97e74c Update kubernetes version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-21 19:24:12 +00:00
Jess Frazelle
c8584f2a6d
Makefile: release static binaries
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
2017-11-15 03:29:51 -05:00
Lantao Liu
9e6d607aae Update containerd to v1.0.0-beta.3
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 21:08:09 +00:00
Lantao Liu
74abfe349d Add crictl config.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 05:28:58 +00:00
Yanqiang Miao
e79bf15dee Update 'hack/versions' and some Kubernetes repo
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-11-03 15:51:14 +08:00
Lantao Liu
1d61b7464b Update containerd to 564600ee79.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-02 22:17:38 +00:00
Lantao Liu
5d46a90b7f Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-30 06:39:19 +00:00
Lantao Liu
25fdf72692 Add image load.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 21:51:04 +00:00
w9n
1a6be2b573 update containerd, runc, cgroups, sys and docker version
Signed-off-by: w9n <w9ncontact@gmail.com>
2017-10-24 22:52:29 +02:00
Lantao Liu
a34bc19f62 Merge pull request #339 from Random-Liu/add-node-e2e-prow
Add prow node e2e test.
2017-10-11 10:36:55 -07:00
Lantao Liu
e4b818ff41 Merge pull request #342 from Random-Liu/update-kubernetes-containerd
Update kubernetes and containerd.
2017-10-11 00:23:24 -07:00
Lantao Liu
bde8b0517e Update kubernetes and containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-11 06:16:19 +00:00
Lantao Liu
5531a71873 Add prow node e2e test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-10 23:29:44 +00:00
Lantao Liu
232f1e4cdc Merge pull request #340 from Random-Liu/disable-maligned
Disable maligned check.
2017-10-10 16:06:05 -07:00
Lantao Liu
aab0c5df77 Disable maligned check.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-10 22:38:00 +00:00
Lantao Liu
2449ffdc42 Add staging tar for node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-07 04:45:10 +00:00
Lantao Liu
e77795b968 Merge pull request #332 from Random-Liu/use-container-update
Use container update
2017-10-06 13:20:30 -07:00
Lantao Liu
f7eaa29c67 Update containerd to 8558b98eb1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-06 01:40:39 +00:00
Lantao Liu
3ff61f9010 Run repodigest test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-05 23:55:55 +00:00
Lantao Liu
e64d267ae8 Update Kubenretes to the right version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-05 06:07:48 +00:00
Lantao Liu
2f5f8be99d Add node e2e test timeout.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-04 01:12:43 +00:00
Lantao Liu
ba757745d2 Update critools version to v0.2.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 03:23:36 +00:00
Lantao Liu
651b0185e1 Update Kubernetes to v1.8.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 02:51:46 +00:00
Lantao Liu
126c0a0e80 Update kubernetes to v1.8.0-rc.1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 21:28:27 +00:00
Lantao Liu
86ee919013 Merge pull request #285 from Random-Liu/no-cni-in-release-tarball
Do not include CNI binaries/configs in release tarball.
2017-09-25 19:18:06 -07:00
Lantao Liu
d1f0ac92c5 Do not include CNI binaries/configs in release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 23:43:32 +00:00
Lantao Liu
b9200ac403 Merge pull request #257 from Random-Liu/add-image-stats
Add image stats and integration test
2017-09-25 15:35:30 -07:00
Lantao Liu
8fb57da18e Add integration test framework
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 21:02:30 +00:00
Lantao Liu
f7f944235b Update containerd to v1.0.0-beta.1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-23 01:00:11 +00:00
Lantao Liu
73a5f7d9b1 Merge pull request #273 from abhinandanpb/cri_cleanup
Adding cri reset script for resetting the states
2017-09-22 13:21:38 -07:00
Abhinandan Prativadi
8fd19d4ed0 Adding cri reset script for resetting the states
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-22 11:37:44 -07:00