github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 07:39:22 +00:00
Code Issues Projects Releases Wiki Activity

remove anti-affinity

Browse Source
This commit is contained in:
Sandeep Rajan 2018-03-01 08:40:48 -05:00
parent 07240b7166
commit 0c07f7d012
4 changed files with 9 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cluster/addons/dns/coredns.yaml.base
View File

@ -58,9 +58,9 @@ data:
.:53 { .:53 {
errors errors
health health
kubernetes __PILLAR__DNS__DOMAIN__ __PILLAR__CLUSTER_CIDR__ { kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream /etc/resolv.conf upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
} }
prometheus :9153 prometheus :9153
@ -98,21 +98,9 @@ spec:
effect: NoSchedule effect: NoSchedule
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: k8s-app
operator: In
values:
- coredns
topologyKey: kubernetes.io/hostname
containers: containers:
- name: coredns - name: coredns
image: coredns/coredns:1.0.4 image: coredns/coredns:1.0.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

18
cluster/addons/dns/coredns.yaml.in
View File

@ -58,9 +58,9 @@ data:
.:53 { .:53 {
errors errors
health health
kubernetes {{ pillar['dns_domain'] }} {{ pillar['service_cluster_ip_range'] }} { kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream /etc/resolv.conf upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
} }
prometheus :9153 prometheus :9153
@ -98,21 +98,9 @@ spec:
effect: NoSchedule effect: NoSchedule
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: k8s-app
operator: In
values:
- coredns
topologyKey: kubernetes.io/hostname
containers: containers:
- name: coredns - name: coredns
image: coredns/coredns:1.0.4 image: coredns/coredns:1.0.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

18
cluster/addons/dns/coredns.yaml.sed
View File

@ -58,9 +58,9 @@ data:
.:53 { .:53 {
errors errors
health health
kubernetes $DNS_DOMAIN $SERVICE_CLUSTER_IP_RANGE { kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream /etc/resolv.conf upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
} }
prometheus :9153 prometheus :9153
@ -98,21 +98,9 @@ spec:
effect: NoSchedule effect: NoSchedule
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: k8s-app
operator: In
values:
- coredns
topologyKey: kubernetes.io/hostname
containers: containers:
- name: coredns - name: coredns
image: coredns/coredns:1.0.4 image: coredns/coredns:1.0.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

12
cmd/kubeadm/app/phases/addons/dns/manifests.go
View File

@ -243,18 +243,6 @@ spec:
operator: Exists operator: Exists
- key: {{ .MasterTaintKey }} - key: {{ .MasterTaintKey }}
effect: NoSchedule effect: NoSchedule
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: k8s-app
operator: In
values:
- coredns
topologyKey: kubernetes.io/hostname
containers: containers:
- name: coredns - name: coredns
image: coredns/coredns:{{ .Version }} image: coredns/coredns:{{ .Version }}