From 786f460092f69d0128840fa0931992dbace94178 Mon Sep 17 00:00:00 2001 From: Steve Coffman Date: Fri, 8 Sep 2017 14:53:50 -0400 Subject: [PATCH 1/2] kube-dns-anti-affinity: kube-dns never-co-located-in-the-same-node --- cluster/addons/dns/kube-dns.yaml.base | 9 +++++++++ cluster/addons/dns/kube-dns.yaml.in | 9 +++++++++ cluster/addons/dns/kube-dns.yaml.sed | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/cluster/addons/dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns.yaml.base index e25ad51de97..38396e4bee9 100644 --- a/cluster/addons/dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns.yaml.base @@ -84,6 +84,15 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: k8s-app + operator: In + values: ["kube-dns"] + topologyKey: kubernetes.io/hostname tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/cluster/addons/dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns.yaml.in index c3beaa7b955..3e9cd6c590e 100644 --- a/cluster/addons/dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns.yaml.in @@ -84,6 +84,15 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: k8s-app + operator: In + values: ["kube-dns"] + topologyKey: kubernetes.io/hostname tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/cluster/addons/dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns.yaml.sed index bc1bf6f057f..a54cffdade1 100644 --- a/cluster/addons/dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns.yaml.sed @@ -84,6 +84,15 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: k8s-app + operator: In + values: ["kube-dns"] + topologyKey: kubernetes.io/hostname tolerations: - key: "CriticalAddonsOnly" operator: "Exists" From e6540d422b22983b37380ed18ac337a4ef46acea Mon Sep 17 00:00:00 2001 From: Steve Coffman Date: Fri, 13 Oct 2017 17:21:06 -0400 Subject: [PATCH 2/2] kube-dns-anti-affinity: Adjust to match different scheme --- cluster/addons/dns/kube-dns.yaml.base | 4 +++- cluster/addons/dns/kube-dns.yaml.in | 4 +++- cluster/addons/dns/kube-dns.yaml.sed | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cluster/addons/dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns.yaml.base index 38396e4bee9..4445b5b4562 100644 --- a/cluster/addons/dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns.yaml.base @@ -87,7 +87,9 @@ spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - labelSelector: + - weight: 100 + podAffinityTerm: + labelSelector: matchExpressions: - key: k8s-app operator: In diff --git a/cluster/addons/dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns.yaml.in index 3e9cd6c590e..140737a7910 100644 --- a/cluster/addons/dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns.yaml.in @@ -87,7 +87,9 @@ spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - labelSelector: + - weight: 100 + podAffinityTerm: + labelSelector: matchExpressions: - key: k8s-app operator: In diff --git a/cluster/addons/dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns.yaml.sed index a54cffdade1..395c47d6fb8 100644 --- a/cluster/addons/dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns.yaml.sed @@ -87,7 +87,9 @@ spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - labelSelector: + - weight: 100 + podAffinityTerm: + labelSelector: matchExpressions: - key: k8s-app operator: In