dbf0117733 
								
							 
						 
						
							
							
								
								Merge pull request  #25115  from SomtochiAma/merged-master-dev-1.20  
							
							... 
							
							
							
							Merge master into dev-1.20 to keep in sync 
							
						 
						
							2020-11-19 08:58:52 -08:00  
				
					
						
							
							
								 
						
							
								ba77c903ed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into dev-1.20  
							
							
							
						 
						
							2020-11-19 17:09:49 +01:00  
				
					
						
							
							
								 
						
							
								3cc410cd01 
								
							 
						 
						
							
							
								
								Merge pull request  #25086  from bassaer/fix-jp-cheatsheet  
							
							... 
							
							
							
							remove a conflict marker from Japanese cheatsheet.md 
							
						 
						
							2020-11-18 22:10:50 -08:00  
				
					
						
							
							
								 
						
							
								f732e8ea87 
								
							 
						 
						
							
							
								
								Adding cloud native security whitepaper blog post with image ( #25010 )  
							
							... 
							
							
							
							* Adding cloud native security whitepaper blog post with image
* Injecting image in a markdown native way instead of html tags
Co-authored-by: Tim Bannister <tim@scalefactory.com>
* Switch image to SVG
* Update cloud native security whitepaper link
Linked to CNCF blog post
Co-authored-by: Tim Bannister <tim@scalefactory.com> 
							
						 
						
							2020-11-18 10:42:04 -08:00  
				
					
						
							
							
								 
						
							
								35b3eba07d 
								
							 
						 
						
							
							
								
								Merge pull request  #24643  from cognifloyd/patch-1  
							
							... 
							
							
							
							Fix minor typo in StatefulSets docs 
							
						 
						
							2020-11-18 09:58:05 -08:00  
				
					
						
							
							
								 
						
							
								95217e66b1 
								
							 
						 
						
							
							
								
								Merge pull request  #25102  from balanceiskey/patch-1  
							
							... 
							
							
							
							Update configmap.md 
							
						 
						
							2020-11-18 09:54:05 -08:00  
				
					
						
							
							
								 
						
							
								17f418f6d0 
								
							 
						 
						
							
							
								
								Merge pull request  #25087  from sftim/20201117_add_cks_training  
							
							... 
							
							
							
							Add CKS to training page 
							
						 
						
							2020-11-18 09:50:07 -08:00  
				
					
						
							
							
								 
						
							
								938d569e8e 
								
							 
						 
						
							
							
								
								Add CKS to training page  
							
							... 
							
							
							
							CKS is a two-hour, performance-based certification exam that provides
assurance that a certificant has the skills, knowledge, and competence on
a broad range of best practices for securing container-based applications
and Kubernetes platforms during build, deployment, and runtime. And now
it's live. 
							
						 
						
							2020-11-18 17:38:31 +00:00  
				
					
						
							
							
								 
						
							
								97629eba26 
								
							 
						 
						
							
							
								
								Update configmap.md  
							
							
							
						 
						
							2020-11-18 10:40:55 -06:00  
				
					
						
							
							
								 
						
							
								2faaed676c 
								
							 
						 
						
							
							
								
								Merge pull request  #24874  from janosi/mixedprotocollb  
							
							... 
							
							
							
							Document the support of mixed protocol values in the LoadBalancer type of Services 
							
						 
						
							2020-11-18 07:00:06 -08:00  
				
					
						
							
							
								 
						
							
								754db5345e 
								
							 
						 
						
							
							
								
								Merge pull request  #25089  from scoulomb-dup-fork/cm-cmd-args  
							
							... 
							
							
							
							Improve configmap usage as pod command and args 
							
						 
						
							2020-11-18 06:54:05 -08:00  
				
					
						
							
							
								 
						
							
								8d225a1c73 
								
							 
						 
						
							
							
								
								Merge pull request  #25088  from jjasghar/patch-1  
							
							... 
							
							
							
							Update health-checks.md 
							
						 
						
							2020-11-18 06:28:06 -08:00  
				
					
						
							
							
								 
						
							
								8a585553e1 
								
							 
						 
						
							
							
								
								Merge pull request  #25092  from tengqm/fix-shortcode  
							
							... 
							
							
							
							Use card mode for cncf-landscape shortcode 
							
						 
						
							2020-11-18 06:26:05 -08:00  
				
					
						
							
							
								 
						
							
								cc0d8b78ad 
								
							 
						 
						
							
							
								
								Merge pull request  #25068  from scoulomb-dup-fork/cm  
							
							... 
							
							
							
							Use configmap inside a k8s pod command, as entrypoint is docker specific 
							
						 
						
							2020-11-17 22:54:04 -08:00  
				
					
						
							
							
								 
						
							
								077f3a450e 
								
							 
						 
						
							
							
								
								Merge pull request  #25093  from DangHT/master  
							
							... 
							
							
							
							[zh] remove redundant content 
							
						 
						
							2020-11-17 20:00:04 -08:00  
				
					
						
							
							
								 
						
							
								920e551903 
								
							 
						 
						
							
							
								
								[zh] fix content error  
							
							
							
						 
						
							2020-11-18 11:47:04 +08:00  
				
					
						
							
							
								 
						
							
								9dc3733b56 
								
							 
						 
						
							
							
								
								[zh] fix content error  
							
							
							
						 
						
							2020-11-18 11:42:58 +08:00  
				
					
						
							
							
								 
						
							
								ce42422211 
								
							 
						 
						
							
							
								
								[zh] remove redundant content  
							
							
							
						 
						
							2020-11-18 10:52:55 +08:00  
				
					
						
							
							
								 
						
							
								414266968a 
								
							 
						 
						
							
							
								
								Merge pull request  #1  from kubernetes/master  
							
							... 
							
							
							
							update from upstream 
							
						 
						
							2020-11-18 10:47:46 +08:00  
				
					
						
							
							
								 
						
							
								606d0da197 
								
							 
						 
						
							
							
								
								Merge pull request  #25079  from mysunshine92/update-feature-gates-ServiceAppProtocol  
							
							... 
							
							
							
							Update feature-gates: delete redundant description for ServiceAppProtocol 
							
						 
						
							2020-11-17 18:34:05 -08:00  
				
					
						
							
							
								 
						
							
								9ff6274c68 
								
							 
						 
						
							
							
								
								Update feature-gates: delete redundant description for ServiceAppProtocol  
							
							
							
						 
						
							2020-11-18 10:12:32 +08:00  
				
					
						
							
							
								 
						
							
								51ab191ec0 
								
							 
						 
						
							
							
								
								Use card mode for cncf-landscape shortcode  
							
							... 
							
							
							
							The repeated icons are causing confusing. 
							
						 
						
							2020-11-18 10:12:01 +08:00  
				
					
						
							
							
								 
						
							
								db743f5bd8 
								
							 
						 
						
							
							
								
								Merge pull request  #25028  from zshihang/dev-1.20  
							
							... 
							
							
							
							add description for CSIServiceAccountToken 
							
						 
						
							2020-11-17 14:16:04 -08:00  
				
					
						
							
							
								 
						
							
								28b9c608d7 
								
							 
						 
						
							
							
								
								Merge pull request  #24826  from Arhell/fix-button  
							
							... 
							
							
							
							fix "read more" button 
							
						 
						
							2020-11-17 13:58:05 -08:00  
				
					
						
							
							
								 
						
							
								08fbeb5953 
								
							 
						 
						
							
							
								
								Use configmap inside a k8s pod command, as entrypoint is docker specific  
							
							
							
						 
						
							2020-11-17 22:34:17 +01:00  
				
					
						
							
							
								 
						
							
								1ec78b1f28 
								
							 
						 
						
							
							
								
								Improve configmap usage as pod command and args  
							
							
							
						 
						
							2020-11-17 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								3be56a6099 
								
							 
						 
						
							
							
								
								Update health-checks.md  
							
							... 
							
							
							
							Looks like the formatting for ```shell isn't outputting correctly on the page.
Signed-off-by: JJ Asghar <jjasghar@gmail.com> 
							
						 
						
							2020-11-17 14:45:19 -06:00  
				
					
						
							
							
								 
						
							
								c640aee603 
								
							 
						 
						
							
							
								
								explain the new MixedProtocolLBService feature flag  
							
							
							
						 
						
							2020-11-17 19:49:17 +00:00  
				
					
						
							
							
								 
						
							
								de6d96dc5c 
								
							 
						 
						
							
							
								
								Merge pull request  #25083  from eyenx/patch-2  
							
							... 
							
							
							
							Update dead Link to Docker EE Installation 
							
						 
						
							2020-11-17 10:58:05 -08:00  
				
					
						
							
							
								 
						
							
								ade0bc97d4 
								
							 
						 
						
							
							
								
								Merge pull request  #25084  from sftim/20201117_fix_kubecon_banner  
							
							... 
							
							
							
							Fix KubeCon banner 
							
						 
						
							2020-11-17 09:14:05 -08:00  
				
					
						
							
							
								 
						
							
								8ae0b72e59 
								
							 
						 
						
							
							
								
								remove conflict marker  
							
							
							
						 
						
							2020-11-18 01:44:42 +09:00  
				
					
						
							
							
								 
						
							
								bb270a2b82 
								
							 
						 
						
							
							
								
								Merge pull request  #25085  from sharath94z/patch-1  
							
							... 
							
							
							
							Fix typo in container restart policy doc 
							
						 
						
							2020-11-17 08:16:04 -08:00  
				
					
						
							
							
								 
						
							
								983df6134c 
								
							 
						 
						
							
							
								
								Fix typo in container restart policy  #25041  
							
							... 
							
							
							
							Issue: https://github.com/kubernetes/website/issues/25041 
Description: Missing space in the word "forthat", it should be "for that".
Fix: Fixed the missing space in "forthat" under the topic "Container restart policy".
Doc link: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy  
							
						 
						
							2020-11-17 20:11:39 +05:30  
				
					
						
							
							
								 
						
							
								88d31d27a2 
								
							 
						 
						
							
							
								
								Fix KubeCon banner  
							
							... 
							
							
							
							- match event theme
  artwork color copied from https://github.com/cncf/artwork/blob/master/examples/other.md 
- fix broken logo link 
							
						 
						
							2020-11-17 13:36:50 +00:00  
				
					
						
							
							
								 
						
							
								ccbab9c9d6 
								
							 
						 
						
							
							
								
								Update dead Link to Docker EE Installation  
							
							... 
							
							
							
							Link to official documentation. Mirantis Link is dead (404) 
							
						 
						
							2020-11-17 14:33:43 +01:00  
				
					
						
							
							
								 
						
							
								497e2ccb10 
								
							 
						 
						
							
							
								
								Merge pull request  #25036  from tengqm/zh-sync-network-policy  
							
							... 
							
							
							
							[zh] Resync concepts/services-networking/network-policies.md 
							
						 
						
							2020-11-17 04:30:07 -08:00  
				
					
						
							
							
								 
						
							
								84df6d3207 
								
							 
						 
						
							
							
								
								[zh] Resync network-policies  
							
							
							
						 
						
							2020-11-17 16:50:29 +08:00  
				
					
						
							
							
								 
						
							
								dcd16d57fa 
								
							 
						 
						
							
							
								
								Merge pull request  #25072  from yuandongx/patch-1  
							
							... 
							
							
							
							【ZH】typo : 云控制器管理器的基础概念 #25060  
							
						 
						
							2020-11-16 21:20:05 -08:00  
				
					
						
							
							
								 
						
							
								9fe5011ec8 
								
							 
						 
						
							
							
								
								【ZH】typo : 云控制器管理器的基础概念  #25060  
							
							... 
							
							
							
							fix typo kubernetes/website#25060  
							
						 
						
							2020-11-17 12:32:14 +08:00  
				
					
						
							
							
								 
						
							
								ce40d8da83 
								
							 
						 
						
							
							
								
								Merge pull request  #24538  from Cweiping/feature/fix_node-conformance_apiserver_adress_error  
							
							... 
							
							
							
							fix node-conformance apiserver adress flag error 
							
						 
						
							2020-11-16 18:46:04 -08:00  
				
					
						
							
							
								 
						
							
								e245787641 
								
							 
						 
						
							
							
								
								fix node-conformance apiserver adress error  
							
							... 
							
							
							
							Signed-off-by: Weiping Cai <weiping.cai@daocloud.io> 
							
						 
						
							2020-11-17 10:11:45 +08:00  
				
					
						
							
							
								 
						
							
								b9cd9ddaa4 
								
							 
						 
						
							
							
								
								add description for CSIServiceAccountToken  
							
							
							
						 
						
							2020-11-16 18:06:09 -08:00  
				
					
						
							
							
								 
						
							
								a0803dbc59 
								
							 
						 
						
							
							
								
								Merge pull request  #24999  from tengqm/zh-sync-2  
							
							... 
							
							
							
							[zh] Sync changes from English site (2) 
							
						 
						
							2020-11-16 17:46:04 -08:00  
				
					
						
							
							
								 
						
							
								45da282d76 
								
							 
						 
						
							
							
								
								Merge pull request  #24998  from tengqm/zh-sync-1  
							
							... 
							
							
							
							[zh] Sync changes from English site (1) 
							
						 
						
							2020-11-16 17:44:06 -08:00  
				
					
						
							
							
								 
						
							
								3f689758dc 
								
							 
						 
						
							
							
								
								Merge pull request  #24719  from tengqm/zh-translate-test  
							
							... 
							
							
							
							[zh] Translate docs/test.md 
							
						 
						
							2020-11-16 17:42:05 -08:00  
				
					
						
							
							
								 
						
							
								e5f81e70fa 
								
							 
						 
						
							
							
								
								Merge pull request  #25050  from pierrchen/etcdSetup  
							
							... 
							
							
							
							kubeadm: add instruction to check kubelet status 
							
						 
						
							2020-11-16 16:22:05 -08:00  
				
					
						
							
							
								 
						
							
								d249077048 
								
							 
						 
						
							
							
								
								Merge pull request  #24907  from neolit123/1.20-master-label  
							
							... 
							
							
							
							kubeadm: remove general output from "kubeadm init" 
							
						 
						
							2020-11-16 14:46:04 -08:00  
				
					
						
							
							
								 
						
							
								6953047371 
								
							 
						 
						
							
							
								
								fix "read more" button  
							
							
							
						 
						
							2020-11-17 00:24:37 +02:00  
				
					
						
							
							
								 
						
							
								dd402eff76 
								
							 
						 
						
							
							
								
								kubeadm: remove general output from "kubeadm init"  
							
							... 
							
							
							
							Leave only the message:
  "Your Kubernetes control-plane has initialized..."
and the details bellow it. 
							
						 
						
							2020-11-16 22:53:36 +02:00  
				
					
						
							
							
								 
						
							
								2c60b53b0c 
								
							 
						 
						
							
							
								
								Merge pull request  #25049  from tengqm/drop-turnkey  
							
							... 
							
							
							
							[zh] Drop turnkey cloud solutions 
							
						 
						
							2020-11-16 07:17:05 -08:00