Lantao Liu 
							
						 
					 
					
						
						
							
						
						d1f9611cb0 
					 
					
						
						
							
							Use wait instead of TaskExit.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2019-04-18 00:18:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						1442425f92 
					 
					
						
						
							
							Support runtime specific configurations.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-10-08 17:17:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yanxuean 
							
						 
					 
					
						
						
							
						
						7065dd81f9 
					 
					
						
						
							
							support no_pivot option for runc  
						
						 
						
						... 
						
						
						
						Signed-off-by: yanxuean <yan.xuean@zte.com.cn > 
						
						
					 
					
						2018-07-20 08:46:50 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						405f57f8e0 
					 
					
						
						
							
							Add max_container_log_size  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-06-14 14:24:17 -07: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 
							
						 
					 
					
						
						
							
						
						e1fe1abff0 
					 
					
						
						
							
							Use github.com/pkg/errors  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-03-17 02:24:38 +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 
							
						 
					 
					
						
						
							
						
						f01c6d73a6 
					 
					
						
						
							
							Fix cleanup context.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-03-07 07:05:27 +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 
							
						 
					 
					
						
						
							
						
						605b4a7b6a 
					 
					
						
						
							
							Update imports  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-02-08 02:45:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						df58d6825d 
					 
					
						
						
							
							Avoid containerd access as much as possible.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-01-25 23:36:00 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						3d68005c04 
					 
					
						
						
							
							Replace glog with logrus  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-01-17 21:57:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						025ffe551f 
					 
					
						
						
							
							Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-01-10 22:35:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						572e354a2d 
					 
					
						
						
							
							Revert debug code.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-12-05 07:40:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						bd6d530290 
					 
					
						
						
							
							Merge pull request  #463  from Random-Liu/dump-rootfs  
						
						 
						
						... 
						
						
						
						Check and dump rootfs. 
						
						
					 
					
						2017-12-03 09:23:04 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						a23bdf25d8 
					 
					
						
						
							
							Check and dump rootfs.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-12-03 11:39:54 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhi 
							
						 
					 
					
						
						
							
						
						43c05efb22 
					 
					
						
						
							
							Revert: Setting containerd shim cgroup same as pod cgroup  
						
						 
						
						... 
						
						
						
						Signed-off-by: abhi <abhi@docker.com > 
						
						
					 
					
						2017-12-01 16:03:38 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						181d7d5076 
					 
					
						
						
							
							Move shim cgroup opts to pkg/containerd/opts.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-12-01 19:18:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhi 
							
						 
					 
					
						
						
							
						
						0d6774f4af 
					 
					
						
						
							
							Setting containerd shim cgroup same as pod cgroup  
						
						 
						
						... 
						
						
						
						Signed-off-by: abhi <abhi@docker.com > 
						
						
					 
					
						2017-12-01 08:33:50 -08: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 
							
						 
					 
					
						
						
							
						
						e41b6d3c24 
					 
					
						
						
							
							Refactor container io code  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-11-10 21:03:29 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						4eaaee380f 
					 
					
						
						
							
							Fix removing state recover.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-10-31 20:03:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						f10cc58362 
					 
					
						
						
							
							Revert "Put containerd-shim into pod cgroup"  
						
						 
						
						... 
						
						
						
						This reverts commit e9cf1d5909 .
Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-10-27 05:33:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yanqiang Miao 
							
						 
					 
					
						
						
							
						
						e9cf1d5909 
					 
					
						
						
							
							Put containerd-shim into pod cgroup  
						
						 
						
						... 
						
						
						
						Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn > 
						
						
					 
					
						2017-10-26 10:17:12 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						e78c85f76b 
					 
					
						
						
							
							Use new container update function  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-10-06 17:57:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						a81a47bf9b 
					 
					
						
						
							
							Fix update container resources  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-10-03 06:03:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						cc1b0b6709 
					 
					
						
						
							
							Add restart recovery logic.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-09-21 17:59:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						c3cb1cfde8 
					 
					
						
						
							
							Revert "Setting containerd shim cgroup same as pod cgroup"  
						
						 
						
						... 
						
						
						
						This reverts commit 59008c608e .
Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-09-02 04:20:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prativadi 
							
						 
					 
					
						
						
							
						
						59008c608e 
					 
					
						
						
							
							Setting containerd shim cgroup same as pod cgroup  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prativadi <abhi@docker.com > 
						
						
					 
					
						2017-08-31 15:16:51 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						73bb9696e8 
					 
					
						
						
							
							Merge pull request  #151  from Random-Liu/add-instrumented-service  
						
						 
						
						... 
						
						
						
						Add instrumented service. 
						
						
					 
					
						2017-08-24 11:26:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						45ee2e554a 
					 
					
						
						
							
							Add container attach support.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-23 23:48:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						195b52500f 
					 
					
						
						
							
							Add instrumented service.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-23 07:02:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prativadi 
							
						 
					 
					
						
						
							
						
						32e0313418 
					 
					
						
						
							
							Containerd client integration  
						
						 
						
						... 
						
						
						
						This commit:
1) Replaces the usage of containerd GRPC APIs with the containerd client for all operations related to containerd.
2) Updated containerd to v1.0alpha4+
3) Updated runc to v1.0.0
Signed-off-by: Abhinandan Prativadi <abhi@docker.com > 
						
						
					 
					
						2017-08-16 14:43:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						73748840da 
					 
					
						
						
							
							Swicth to 1.0.0-alpha2 containerd api.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2017-08-02 23:21:37 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						7b16a35287 
					 
					
						
						
							
							Use new metadata store.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-07-28 23:35:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						4317e6119a 
					 
					
						
						
							
							Remove sandbox truncindex.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-07-28 23:35:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						862d00a21c 
					 
					
						
						
							
							Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-21 01:56:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						cb9e104cf1 
					 
					
						
						
							
							Create/delete containerd containerd  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-16 16:43:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						6ca9c65578 
					 
					
						
						
							
							Rename more container to task.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-16 02:34:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						bad279e0f6 
					 
					
						
						
							
							Finish snapshot support.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-16 02:34:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						484a326717 
					 
					
						
						
							
							modify code to compile on updated containerd  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2017-06-15 23:14:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						479e8c3045 
					 
					
						
						
							
							Merge pull request  #70  from Random-Liu/mount-cgroup  
						
						 
						
						... 
						
						
						
						Mount cgroup into the container and add unit test for privileged mount. 
						
						
					 
					
						2017-06-12 14:14:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						9b1708b408 
					 
					
						
						
							
							Merge pull request  #71  from Random-Liu/fix-capabilities  
						
						 
						
						... 
						
						
						
						Fix capabilities support. 
						
						
					 
					
						2017-06-12 09:34:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						f247a0819d 
					 
					
						
						
							
							Fix capabilities support.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-12 16:18:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						9d5990fe4f 
					 
					
						
						
							
							Add sandbox /dev/shm.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-11 09:49:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						ffa4ffe3bf 
					 
					
						
						
							
							Mount cgroup into the container and add unit test for privileged mount.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-11 02:23:59 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						e9a930b28b 
					 
					
						
						
							
							Merge pull request  #51  from heartlock/support-privileged  
						
						 
						
						... 
						
						
						
						Support privileged 
						
						
					 
					
						2017-06-10 17:30:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Crazykev 
							
						 
					 
					
						
						
							
						
						9bf7ffd51a 
					 
					
						
						
							
							generate and maintain resolv.conf for sandbox  
						
						 
						
						... 
						
						
						
						Signed-off-by: Crazykev <crazykev@zju.edu.cn > 
						
						
					 
					
						2017-06-09 19:36:30 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heartlock 
							
						 
					 
					
						
						
							
						
						dda03f733a 
					 
					
						
						
							
							support privileged  
						
						 
						
						... 
						
						
						
						Signed-off-by: heartlock <21521209@zju.edu.cn > 
						
						
					 
					
						2017-06-09 15:42:04 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						88f4c252d6 
					 
					
						
						
							
							Add sandbox /etc/hosts when using host network  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-06 06:43:38 +00:00