whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  s/Wildard/Wildcard/
  rephrase the sentence
  Fix the number of processes on Kubernetes master (#2985)
  Pod Security Policy doc improvements (#3010)
  docs/admin: document OpenID Connect plugin "extra-scopes" field

# Conflicts:
#	docs/admin/kubelet.md
#	docs/user-guide/pod-security-policy/index.md
This commit is contained in:
Andrew Chen
2017-03-27 16:12:50 -07:00
parent aa100411c3 40ff2f7e72
commit 403c2c1510
6 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/kubelet.md
+2 -2
View File
@@ -16,8 +16,8 @@ various mechanisms (primarily through the apiserver) and ensures that the contai
described in those PodSpecs are running and healthy. The kubelet doesn't manage
containers which were not created by Kubernetes.
Other than from an PodSpec from the apiserver, there are three ways that a container
manifest can be provided to the Kubelet.
Other than from a PodSpec, there are three ways that a container
manifest can be provided to the Kubelet from the apiserver.
File: Path passed as a flag on the command line. This file is rechecked every 20
seconds (configurable with a flag).