Merge pull request #59357 from kubernetes/revert-57683-kube-dns-anti-affinity

Automatic merge from submit-queue (batch tested with PRs 59158, 38320, 59059, 55516, 59357). 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 "Add self anti-affinity to kube-dns pods" Reverts kubernetes/kubernetes#57683 Fixes https://github.com/kubernetes/kubernetes/issues/54164 /cc @wojtek-t cc @bsalamat @misterikkit @bowei @MrHohn

Merge pull request #59357 from kubernetes/revert-57683-kube-dns-anti-affinity
b80ee8c0 · Kubernetes Submit Queue · GitHub · 3021aa22 · 9305c37d · b80ee8c0
Unverified Commit b80ee8c0 authored Feb 05, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 05, 2018
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"