Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  whatisk8s - Chinese version (#3243)
  split rows and nest to stack columns (#4129)
  Updates to docs/admin/kubelet-tls-bootstrapping (#3617)
  Replace "Pod Injection Policy" with "Pod Preset" (#3667)
  Change example PersistentVolumeClaim
  add PodNodeSelector to admission-controllers (#3691)
  Get pods using a label selector instead of hardcoded indexes. Use JsonPath instead of go-template.
  correct_init_container_state (#3972)
  kubernetes.github.io/docs/tasks/administer-cluster: operating etcd clusters
  Remove --no-check-certificate flag in bare_metal_offline.md

This commit is contained in:

Andrew Chen

2017-06-22 14:43:14 -07:00

parent 64531da47d 0dbeb6d1bf

commit 6b3c84602d

26 changed files with 1577 additions and 153 deletions

									
										docs/tasks/configure-pod-container/task-pv-claim.yaml
									
		+1
		
												View File
												
				@@ -9,3 +9,4 @@ spec:

				  resources:

				    requests:

				      storage: 3Gi

				  storageClassName: ""