Mike Brown 
							
						 
					 
					
						
						
							
						
						560e7d4799 
					 
					
						
						
							
							fixing some doc links  
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2021-06-21 18:24:47 -05:00 
						 
				 
			
				
					
						
							
							
								Zufar Dhiyaulhaq 
							
						 
					 
					
						
						
							
						
						75b4c83f04 
					 
					
						
						
							
							fix deprecation config for default runtime  
						
						... 
						
						
						
						Signed-off-by: Zufar Dhiyaulhaq <zufardhiyaulhaq@gmail.com > 
						
						
					 
					
						2021-06-20 10:09:09 -04:00 
						 
				 
			
				
					
						
							
							
								Mike Brown 
							
						 
					 
					
						
						
							
						
						7a2b04758b 
					 
					
						
						
							
							adds explanation for seccomp unset/unconfined default vs runtime default  
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2021-06-07 17:57:18 -05:00 
						 
				 
			
				
					
						
							
							
								Iceber Gu 
							
						 
					 
					
						
						
							
						
						93d4541a20 
					 
					
						
						
							
							docs/cri: update ocicrypt link  
						
						... 
						
						
						
						Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io > 
						
						
					 
					
						2021-05-31 15:32:30 +08:00 
						 
				 
			
				
					
						
							
							
								Iceber Gu 
							
						 
					 
					
						
						
							
						
						7924664951 
					 
					
						
						
							
							docs/cri: fix broken links  
						
						... 
						
						
						
						Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io > 
						
						
					 
					
						2021-05-31 15:31:51 +08:00 
						 
				 
			
				
					
						
							
							
								Gaurav Gahlot 
							
						 
					 
					
						
						
							
						
						a5b1740bbe 
					 
					
						
						
							
							fixed typos  
						
						... 
						
						
						
						Signed-off-by: Gaurav Gahlot <gauravgahlot0107@gmail.com > 
						
						
					 
					
						2021-05-19 10:31:50 +05:30 
						 
				 
			
				
					
						
							
							
								maoyangLiu 
							
						 
					 
					
						
						
							
						
						abd4be07ac 
					 
					
						
						
							
							fix the 404 url  
						
						... 
						
						
						
						Signed-off-by: maoyangLiu <liumaoyang@inspur.com > 
						
						
					 
					
						2021-04-13 20:55:26 +08:00 
						 
				 
			
				
					
						
							
							
								Mike Brown 
							
						 
					 
					
						
						
							
						
						e96d2a5d90 
					 
					
						
						
							
							Revert "remove two very old no longer used runtime options"  
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2021-04-12 10:16:01 -05:00 
						 
				 
			
				
					
						
							
							
								Mike Brown 
							
						 
					 
					
						
						
							
						
						f9bcf4a8a4 
					 
					
						
						
							
							add section link  
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2021-04-07 12:29:43 -05:00 
						 
				 
			
				
					
						
							
							
								Mike Brown 
							
						 
					 
					
						
						
							
						
						d4be6aa8fa 
					 
					
						
						
							
							rm mirror defaults; doc registry deprecations  
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2021-04-07 12:29:43 -05:00 
						 
				 
			
				
					
						
							
							
								Mike Brown 
							
						 
					 
					
						
						
							
						
						0186a329e9 
					 
					
						
						
							
							remove two very old no longer used runtime options  
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2021-04-06 20:41:09 -05:00 
						 
				 
			
				
					
						
							
							
								Fu, Wei 
							
						 
					 
					
						
						
							
						
						80fa9fe32a 
					 
					
						
						
							
							Merge pull request  #5135  from AkihiroSuda/default-config-crypt  
						
						... 
						
						
						
						add imgcrypt stream processors to the default config 
						
						
					 
					
						2021-03-25 14:31:38 +08:00 
						 
				 
			
				
					
						
							
							
								Andrei Dobre 
							
						 
					 
					
						
						
							
						
						e4b9b1038b 
					 
					
						
						
							
							Make CRI registry docs more clear  
						
						... 
						
						
						
						Added reference to previous config syntax.
Signed-off-by: Andrei Dobre <andreidobre.web@gmail.com > 
						
						
					 
					
						2021-03-23 22:10:06 +02:00 
						 
				 
			
				
					
						
							
							
								pacoxu 
							
						 
					 
					
						
						
							
						
						ffff688663 
					 
					
						
						
							
							upgrade pause image to 3.5 for non-root  
						
						... 
						
						
						
						Signed-off-by: pacoxu <paco.xu@daocloud.io > 
						
						
					 
					
						2021-03-16 23:20:35 +08:00 
						 
				 
			
				
					
						
							
							
								Akihiro Suda 
							
						 
					 
					
						
						
							
						
						ecb881e5e6 
					 
					
						
						
							
							add imgcrypt stream processors to the default config  
						
						... 
						
						
						
						Enable the following config by default:
```toml
version = 2
[plugins."io.containerd.grpc.v1.cri".image_decryption]
  key_model = "node"
[stream_processors]
  [stream_processors."io.containerd.ocicrypt.decoder.v1.tar.gzip"]
    accepts = ["application/vnd.oci.image.layer.v1.tar+gzip+encrypted"]
    returns = "application/vnd.oci.image.layer.v1.tar+gzip"
    path = "ctd-decoder"
    args = ["--decryption-keys-path", "/etc/containerd/ocicrypt/keys"]
    env = ["OCICRYPT_KEYPROVIDER_CONFIG=/etc/containerd/ocicrypt/ocicrypt_keyprovider.conf"]
  [stream_processors."io.containerd.ocicrypt.decoder.v1.tar"]
    accepts = ["application/vnd.oci.image.layer.v1.tar+encrypted"]
    returns = "application/vnd.oci.image.layer.v1.tar"
    path = "ctd-decoder"
    args = ["--decryption-keys-path", "/etc/containerd/ocicrypt/keys"]
    env = ["OCICRYPT_KEYPROVIDER_CONFIG=/etc/containerd/ocicrypt/ocicrypt_keyprovider.conf"]
```
Fix issue 5128
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp > 
						
						
					 
					
						2021-03-15 13:27:16 +09:00 
						 
				 
			
				
					
						
							
							
								Brian Goff 
							
						 
					 
					
						
						
							
						
						b0b6d9aa03 
					 
					
						
						
							
							Add support for using a host registry dir in cri  
						
						... 
						
						
						
						This will be used instead of the cri registry config in the main config
toml.
---
Also pulls in changes from containerd/cri@d0b4eecbb3 
Signed-off-by: Brian Goff <cpuguy83@gmail.com > 
						
						
					 
					
						2021-03-12 22:42:22 +00:00 
						 
				 
			
				
					
						
							
							
								Iceber Gu 
							
						 
					 
					
						
						
							
						
						f37ae8fc35 
					 
					
						
						
							
							move to v3.4.1 for the pause image  
						
						... 
						
						
						
						Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io > 
						
						
					 
					
						2021-03-07 15:21:20 +08:00 
						 
				 
			
				
					
						
							
							
								alexyadon 
							
						 
					 
					
						
						
							
						
						c61f0ceada 
					 
					
						
						
							
							Fix broken docs links ( #5085 )  
						
						... 
						
						
						
						* docs: fix broken links
Signed-off-by: Alex Yadon <alex.yadon@ibm.com >
* docs: use relative paths
Signed-off-by: Alex Yadon <alex.yadon@ibm.com > 
						
						
					 
					
						2021-02-25 14:09:49 -06:00 
						 
				 
			
				
					
						
							
							
								Lorenz Brun 
							
						 
					 
					
						
						
							
						
						36d0bc1f2b 
					 
					
						
						
							
							Allow moving netns directory into StateDir  
						
						... 
						
						
						
						Signed-off-by: Lorenz Brun <lorenz@nexantic.com > 
						
						
					 
					
						2021-02-10 18:33:14 +01:00 
						 
				 
			
				
					
						
							
							
								Aditi Sharma 
							
						 
					 
					
						
						
							
						
						d09bf18862 
					 
					
						
						
							
							Clean Up Doc and fix some broken links  
						
						... 
						
						
						
						Signed-off-by: Aditi Sharma <adi.sky17@gmail.com > 
						
						
					 
					
						2021-01-20 15:45:43 +05:30 
						 
				 
			
				
					
						
							
							
								Shengjing Zhu 
							
						 
					 
					
						
						
							
						
						91dc69ee43 
					 
					
						
						
							
							docs: point cri release tarball to github release page  
						
						... 
						
						
						
						Signed-off-by: Shengjing Zhu <zhsj@debian.org > 
						
						
					 
					
						2021-01-03 17:50:40 +08:00 
						 
				 
			
				
					
						
							
							
								Kazuyoshi Kato 
							
						 
					 
					
						
						
							
						
						a05fa4214d 
					 
					
						
						
							
							Move CRI plugin's docs from docs/ to docs/cri/  
						
						... 
						
						
						
						There are a lot of documents which are specifically talking about
the CRI plugin. These docs should be in docs/cri/.
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com > 
						
						
					 
					
						2020-11-10 11:49:05 -08:00