Commit Graph

1058 Commits

Author SHA1 Message Date
Lantao Liu
936dcceb5a Update GCE cluster bootstrapping and e2e test
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-06 00:05:02 +00:00
Lantao Liu
f24be111ab
Merge pull request #643 from Random-Liu/events-panic
Fix a potential panic.
2018-03-05 15:13:23 -08:00
Lantao Liu
9a097c9d34
Merge pull request #640 from mikebrow/crictl-load-description
documents load image
2018-03-05 14:36:48 -08:00
Lantao Liu
ceb540d823 Fix potential panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 22:09:58 +00:00
Mike Brown
ffea684c57 documents load image
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-05 15:57:44 -06:00
Lantao Liu
760248df77 Require ansible 2.4+.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:51:59 +00: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
Lantao Liu
d1e9960180 Remove standalone mode
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:45:20 +00:00
Lantao Liu
64b098a293
Merge pull request #636 from Random-Liu/fix-default-config
Only overwrite when legacy options are specified.
2018-03-02 17:51:38 -08:00
Lantao Liu
f8fa536ff7
Merge pull request #635 from mikebrow/travis-golang-fix
fix travis golang issue
2018-03-02 17:51:25 -08:00
Lantao Liu
ef5b9d1e16 Only overwrite when legacy options are specified.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-03 01:03:34 +00:00
Mike Brown
8364abc0f3 fix travis golang issue
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-02 18:50:26 -06:00
Lantao Liu
ba6503870f
Merge pull request #637 from mikebrow/missing-tag
adds allways to ensure there is a version even if no tag
2018-03-02 16:16:03 -08:00
Mike Brown
d371d403b4 adds allways to ensure there is a version even if no tag
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-02 17:15:42 -06:00
Lantao Liu
3d382e2f5d
Merge pull request #632 from jcvenegas/tests-find-containerd-path
tests: Use path found to containerd.
2018-03-02 00:06:47 -08: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
e186ef835d
Merge pull request #631 from Random-Liu/expose-cri-version
Expose cri version for CRI plugin.
2018-02-28 19:40:39 -08:00
Lantao Liu
36b4c05354 Report containerd version instead of cri-containerd version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-01 01:26:37 +00:00
Lantao Liu
e4dd7c2e58 Expose cri version for CRI plugin.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-28 23:39:58 +00:00
Lantao Liu
30b840d620
Merge pull request #629 from mikebrow/golang-version-change
moving to go1.10 only
2018-02-28 13:21:28 -08:00
Mike Brown
c912afd7a9 moving to go1.10 only
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-28 10:39:10 -06:00
Lantao Liu
33851eb2c5
Merge pull request #618 from Random-Liu/add-generic-restart-test
Add generic restart test
2018-02-27 13:42:27 -08:00
Lantao Liu
e43def70c1 Fix travis test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 19:33:41 +00: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
09294fca40 Add generic restart test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 18:21:09 +00:00
Lantao Liu
00cd5b6a0c
Merge pull request #621 from mikebrow/golang-sync-with-containerd
adds go 1.10 to ci test
2018-02-27 10:12:00 -08:00
Lantao Liu
1617181196
Merge pull request #625 from Random-Liu/enable-log-rotation
Enable container log rotation.
2018-02-27 10:11:03 -08:00
Mike Brown
af818b7dcf
Merge pull request #622 from Random-Liu/update-support-matrix
Update support matrix.
2018-02-27 09:45:52 -06:00
Mike Brown
9810257487 adds go 1.10 to ci test
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-27 07:26:18 -06:00
Lantao Liu
ae7303dfbf Enable container log rotation.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 10:44:32 +00:00
Lantao Liu
b450950d54 Update support matrix.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 07:48:16 +00:00
Lantao Liu
820735456c
Merge pull request #620 from Random-Liu/update-cri-tools
Update critools to b184f9aefe60a4441330e615ee20634ee26474fb.
2018-02-26 10:34:27 -08: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
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