upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-10 17:35:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #41212 from bowei/limit-dnsmasq

Browse source 
Automatic merge from submit-queue (batch tested with PRs 41115, 41212, 41346, 41340, 41172)

Send only cluster domain queries to kube-dns

Queries not involving the cluster domain should be forwarded out (not to kube-dns)

```release-note
none
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-13 17:03:48 -08:00 committed by GitHub
commit f693e1e598
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cluster/addons/dns/kubedns-controller.yaml.base
View file

@ -49,7 +49,7 @@ spec:
- name: kube-dns-config
configMap:
name: kube-dns
optional: true
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1
@ -116,8 +116,9 @@ spec:
failureThreshold: 5
args:
- --cache-size=1000
- --no-resolv
- --server=127.0.0.1#10053
- --server=/__PILLAR__DNS__DOMAIN__/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053
- --log-facility=-
ports:
- containerPort: 53

7
cluster/addons/dns/kubedns-controller.yaml.in
View file

@ -49,7 +49,7 @@ spec:
- name: kube-dns-config
configMap:
name: kube-dns
optional: true
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1
@ -116,8 +116,9 @@ spec:
failureThreshold: 5
args:
- --cache-size=1000
- --no-resolv
- --server=127.0.0.1#10053
- --server=/{{ pillar['dns_domain'] }}/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053
- --log-facility=-
ports:
- containerPort: 53

7
cluster/addons/dns/kubedns-controller.yaml.sed
View file

@ -49,7 +49,7 @@ spec:
- name: kube-dns-config
configMap:
name: kube-dns
optional: true
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1
@ -115,8 +115,9 @@ spec:
failureThreshold: 5
args:
- --cache-size=1000
- --no-resolv
- --server=127.0.0.1#10053
- --server=/$DNS_DOMAIN/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053
- --log-facility=-
ports:
- containerPort: 53