From 607c3d69670d624fef86ac21dd9f64ac16dde558 Mon Sep 17 00:00:00 2001 From: Shyam JVS Date: Wed, 18 Oct 2017 22:01:42 +0200 Subject: [PATCH] Revert "kube-dns-anti-affinity: kube-dns never-co-located-in-the-same-node" --- cluster/addons/dns/kube-dns.yaml.base | 11 ----------- cluster/addons/dns/kube-dns.yaml.in | 11 ----------- cluster/addons/dns/kube-dns.yaml.sed | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/cluster/addons/dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns.yaml.base index 0fbda4f447f..f5e49ee35e1 100644 --- a/cluster/addons/dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns.yaml.base @@ -84,17 +84,6 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - 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 b8a431ab307..ee71e5ac903 100644 --- a/cluster/addons/dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns.yaml.in @@ -84,17 +84,6 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - 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 92a29c94cb3..cc894dc5c5f 100644 --- a/cluster/addons/dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns.yaml.sed @@ -84,17 +84,6 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: k8s-app - operator: In - values: ["kube-dns"] - topologyKey: kubernetes.io/hostname tolerations: - key: "CriticalAddonsOnly" operator: "Exists"