Abhinandan Prativadi 
							
						 
					 
					
						
						
							
						
						263b0b99d0 
					 
					
						
						
							
							Change to keep in sync with latest cni config  
						
						 
						
						... 
						
						
						
						This commit contains change to pick the latest cni config
from the configured CNIConfDir.
With this change any changes made to the cni config file will
be picked up on the kubelet's runtime status check call.
Ofcourse this would lead to undefined behavior when the cni config
change is made in parallel during pod creation. However its
reasonable to assume that the operator is aware of the need to
drain the nodes of pods before making cni configuration change.
The behavior is currently not defined in kubernetes. However
I see that similar approach being adopted in the upstream kubernetes
with dockershim. Keeping the behavior consistent for now.
Signed-off-by: Abhinandan Prativadi <abhi@docker.com > 
						
						
					 
					
						2018-06-21 20:43:38 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						d8a3c5f254 
					 
					
						
						
							
							Address comments.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-04-09 18:15:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						b2099c2061 
					 
					
						
						
							
							Add cni config template support.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-04-07 06:34:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhi 
							
						 
					 
					
						
						
							
						
						003bbd4292 
					 
					
						
						
							
							Modifying fake cni plugin  
						
						 
						
						... 
						
						
						
						Signed-off-by: abhi <abhi@docker.com > 
						
						
					 
					
						2018-03-15 17:05:33 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						d113c16802 
					 
					
						
						
							
							Update ocicni to my fork.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-02-02 19:45:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						f36ef46b35 
					 
					
						
						
							
							Use new ocicni.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-09-07 00:14:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						8f898cb3b8 
					 
					
						
						
							
							Import ocicni update from  https://github.com/Random-Liu/ocicni  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-23 01:25: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 
							
						 
					 
					
						
						
							
						
						ffb69423ec 
					 
					
						
						
							
							Temporarily remove unit test relying on fake containerd services.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-07-31 22:42:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						8524a4ef30 
					 
					
						
						
							
							Add schema1 support, and use namespace k8s.io.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-19 18:44:00 +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 
							
						 
					 
					
						
						
							
						
						d4f7380f59 
					 
					
						
						
							
							Merge pull request  #73  from Random-Liu/fix-delete-race  
						
						 
						
						... 
						
						
						
						Fix Delete race. 
						
						
					 
					
						2017-06-14 14:04:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						2ae22b33b7 
					 
					
						
						
							
							Fix a race that fake execution client sends event to closed channel.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-14 01:50:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						bd09d31777 
					 
					
						
						
							
							Fix Delete race.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-14 01:36:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						2df96e1654 
					 
					
						
						
							
							Add unit test.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-31 19:11:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						6eb1ddb1f8 
					 
					
						
						
							
							Add unit test.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-31 00:39:38 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Random-Liu 
							
						 
					 
					
						
						
							
						
						bc7dfa2650 
					 
					
						
						
							
							Update containerd version to  193abed96e.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Random-Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-27 00:07:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Xianglin Gao 
							
						 
					 
					
						
						
							
						
						4a4414987f 
					 
					
						
						
							
							Add unit test  
						
						 
						
						... 
						
						
						
						Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn > 
						
						
					 
					
						2017-05-23 18:30:20 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						10e3afbb23 
					 
					
						
						
							
							Merge pull request  #22  from Random-Liu/add-container-implementation  
						
						 
						
						... 
						
						
						
						Add container implementation 
						
						
					 
					
						2017-05-22 13:21:05 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						322b6ef333 
					 
					
						
						
							
							Add unit test.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-22 19:14:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						dea7ed3fcc 
					 
					
						
						
							
							Merge pull request  #39  from mozhuli/enhance-fake-services  
						
						 
						
						... 
						
						
						
						Enhance fake services 
						
						
					 
					
						2017-05-17 09:03:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						a397b69b09 
					 
					
						
						
							
							Merge pull request  #37  from mozhuli/add-fake-iamges-service  
						
						 
						
						... 
						
						
						
						Add fake images service 
						
						
					 
					
						2017-05-17 09:02:54 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mozhuli 
							
						 
					 
					
						
						
							
						
						938cbe3e74 
					 
					
						
						
							
							Enhance fake services  
						
						 
						
						... 
						
						
						
						Signed-off-by: mozhuli <21621232@zju.edu.cn > 
						
						
					 
					
						2017-05-17 11:25:46 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mozhulee 
							
						 
					 
					
						
						
							
						
						e6b4c3e18c 
					 
					
						
						
							
							Add fake images service  
						
						 
						
						... 
						
						
						
						Signed-off-by: mozhuli <21621232@zju.edu.cn > 
						
						
					 
					
						2017-05-17 11:11:23 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mozhuli 
							
						 
					 
					
						
						
							
						
						0e56cab7c0 
					 
					
						
						
							
							add fake rootfs service  
						
						 
						
						... 
						
						
						
						Signed-off-by: mozhuli <21621232@zju.edu.cn > 
						
						
					 
					
						2017-05-17 10:10:20 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Random-Liu 
							
						 
					 
					
						
						
							
						
						9baadc1b4b 
					 
					
						
						
							
							Enhance fake execution client.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Random-Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-10 10:03:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heartlock 
							
						 
					 
					
						
						
							
						
						c6138870e0 
					 
					
						
						
							
							Add fake execution service  
						
						 
						
						... 
						
						
						
						Signed-off-by: heartlock <21521209@zju.edu.cn > 
						
						
					 
					
						2017-05-04 05:00:06 +00:00