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.7

Browse Source 
* '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
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/admission-controllers.md
+30
View File
@@ -257,6 +257,36 @@ storage classes and how to mark a storage class as default.
This plug-in sets the default forgiveness toleration for pods, which have no forgiveness tolerations, to tolerate
the taints `notready:NoExecute` and `unreachable:NoExecute` for 5 minutes.
### PodNodeSelector
This plug-in defaults and limits what node selectors may be used within a namespace by reading a namespace annotation and a global configuration.
#### Configuration File Format
PodNodeSelector uses the admission config file `--admission-control-config-file` to set configuration options for the behavior of the backend.
Note that the configuration file format will move to a versioned file in a future release.
This file may be json or yaml and has the following format:
```yaml
podNodeSelectorPluginConfig:
clusterDefaultNodeSelector: <node-selectors-labels>
namespace1: <node-selectors-labels>
namespace2: <node-selectors-labels>
```
#### Configuration Annotation Format
PodNodeSelector uses the annotation key `scheduler.alpha.kubernetes.io/node-selector` to assign node selectors to namespaces.
```yaml
apiVersion: v1
kind: Namespace
metadata:
annotations:
scheduler.alpha.kubernetes.io/node-selector: <node-selectors-labels>
name: namespace3
```
### PodSecurityPolicy
This plug-in acts on creation and modification of the pod and determines if it should be admitted