summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-07-22 23:41:17 -0700
committerGitHub <noreply@github.com>2018-07-22 23:41:17 -0700
commit1171a23ab2e4f8950cb1b88a007e2aae8c7bb194 (patch)
tree56da6101b1a4e7b08c10cc68333b10775dbb4b2a
parent1ee42511e6fe91363ac63ae3c36c0d12939f26af (diff)
parent2defcec2749cd40b7337cf574c309f4cdf78ede6 (diff)
Merge pull request #2383 from Huang-Wei/revise-schedule-DS-pod-by-scheduler
fix a mis-placed section in schedule-DS-pod-by-scheduler.md
-rw-r--r--contributors/design-proposals/scheduling/schedule-DS-pod-by-scheduler.md21
1 files changed, 10 insertions, 11 deletions
diff --git a/contributors/design-proposals/scheduling/schedule-DS-pod-by-scheduler.md b/contributors/design-proposals/scheduling/schedule-DS-pod-by-scheduler.md
index c0c7dffa..c7038eac 100644
--- a/contributors/design-proposals/scheduling/schedule-DS-pod-by-scheduler.md
+++ b/contributors/design-proposals/scheduling/schedule-DS-pod-by-scheduler.md
@@ -45,22 +45,21 @@ This option is to leverage NodeAffinity feature to avoid introducing schedulerâ€
1. DS controller filter nodes by nodeSelector, but does NOT check against scheduler’s predicates (e.g. PodFitHostResources)
2. For each node, DS controller creates a Pod for it with the following NodeAffinity
+ ```yaml
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - nodeSelectorTerms:
+ matchExpressions:
+ - key: kubernetes.io/hostname
+ operator: in
+ values:
+ - dest_hostname
+ ```
3. When sync Pods, DS controller will map nodes and pods by this NodeAffinity to check whether Pods are started for nodes
4. In scheduler, DaemonSet Pods will stay pending if scheduling predicates fail. To avoid this, an appropriate priority must
be set to all critical DaemonSet Pods. Scheduler will preempt other pods to ensure critical pods were scheduled even when
the cluster is under resource pressure.
-```yaml
-nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - nodeSelectorTerms:
- matchExpressions:
- - key: kubernetes.io/hostname
- operator: in
- values:
- - dest_hostname
-```
-
## Reference
* [DaemonsetController can't feel it when node has more resources, e.g. other Pod exits](https://github.com/kubernetes/kubernetes/issues/46935)