Merge pull request #41212 from bowei/limit-dnsmasq

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

Merge pull request #41212 from bowei/limit-dnsmasq
f693e1e5 · Kubernetes Submit Queue · GitHub · cfb08cd9 · da291a7b · f693e1e5
Commit f693e1e5 authored Feb 13, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 13, 2017
3 changed files
--- a/cluster/addons/dns/kubedns-controller.yaml.base
+++ b/cluster/addons/dns/kubedns-controller.yaml.base
@@ -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

--- a/cluster/addons/dns/kubedns-controller.yaml.in
+++ b/cluster/addons/dns/kubedns-controller.yaml.in
@@ -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

--- a/cluster/addons/dns/kubedns-controller.yaml.sed
+++ b/cluster/addons/dns/kubedns-controller.yaml.sed
@@ -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