Merge pull request #54166 from kubernetes/revert-52193-kube-dns-anti-affinity

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Revert "kube-dns-anti-affinity: kube-dns never-co-located-in-the-same-node" Reverts kubernetes/kubernetes#52193 As this has slowed down scheduling of kube-dns pods significantly (fixes https://github.com/kubernetes/kubernetes/issues/54164) /cc @bowei @MrHohn @StevenACoffman

Merge pull request #54166 from kubernetes/revert-52193-kube-dns-anti-affinity
ea072642 · Kubernetes Submit Queue · GitHub · 7f26f03b · 607c3d69 · ea072642
Commit ea072642 authored Oct 18, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 18, 2017
Showing with 0 additions and 33 deletions

kube-dns.yaml.base cluster/addons/dns/kube-dns.yaml.base +0 -11

kube-dns.yaml.in cluster/addons/dns/kube-dns.yaml.in +0 -11

kube-dns.yaml.sed cluster/addons/dns/kube-dns.yaml.sed +0 -11

No files found.
--- 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"

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

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