From 05f692d9f69e6882097b159b0a9237ae64edc2fe Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Fri, 2 Dec 2016 16:24:22 -0800
Subject: [PATCH] Fixes kubedns logging level

---
 cluster/addons/dns/skydns-rc.yaml.base                      | 4 +---
 cluster/addons/dns/skydns-rc.yaml.in                        | 4 +---
 cluster/addons/dns/skydns-rc.yaml.sed                       | 4 +---
 cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml | 2 +-
 cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml    | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cluster/addons/dns/skydns-rc.yaml.base b/cluster/addons/dns/skydns-rc.yaml.base
index ff76ba18fca..90175ef59ac 100644
--- a/cluster/addons/dns/skydns-rc.yaml.base
+++ b/cluster/addons/dns/skydns-rc.yaml.base
@@ -81,9 +81,7 @@ spec:
         - --domain=__PILLAR__DNS__DOMAIN__.
         - --dns-port=10053
         - --config-map=kube-dns
-        # This should be set to v=2 only after the new image (cut from 1.5) has
-        # been released, otherwise we will flood the logs.
-        - --v=0
+        - --v=2
         __PILLAR__FEDERATIONS__DOMAIN__MAP__
         env:
         - name: PROMETHEUS_PORT
diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 188a14fd5ce..c0f4b560ddb 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -81,9 +81,7 @@ spec:
         - --domain={{ pillar['dns_domain'] }}.
         - --dns-port=10053
         - --config-map=kube-dns
-        # This should be set to v=2 only after the new image (cut from 1.5) has
-        # been released, otherwise we will flood the logs.
-        - --v=0
+        - --v=2
         {{ pillar['federations_domain_map'] }}
         env:
         - name: PROMETHEUS_PORT
diff --git a/cluster/addons/dns/skydns-rc.yaml.sed b/cluster/addons/dns/skydns-rc.yaml.sed
index 1c4268d9f46..63c4475cf8c 100644
--- a/cluster/addons/dns/skydns-rc.yaml.sed
+++ b/cluster/addons/dns/skydns-rc.yaml.sed
@@ -81,9 +81,7 @@ spec:
         - --domain=$DNS_DOMAIN.
         - --dns-port=10053
         - --config-map=kube-dns
-        # This should be set to v=2 only after the new image (cut from 1.5) has
-        # been released, otherwise we will flood the logs.
-        - --v=0
+        - --v=2
         env:
         - name: PROMETHEUS_PORT
           value: "10055"
diff --git a/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml b/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
index e5bc42835a2..fd22f64a6df 100644
--- a/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
@@ -62,7 +62,7 @@ spec:
         - --domain=${DNS_DOMAIN}.
         - --dns-port=10053
         - --config-map=kube-dns
-        - --v=0
+        - --v=2
         env:
           - name: PROMETHEUS_PORT
             value: "10055"
diff --git a/cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml b/cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
index 1703231f199..31b8020d9ee 100644
--- a/cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
+++ b/cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
@@ -78,7 +78,7 @@ spec:
         - --domain={{ pillar['dns_domain'] }}.
         - --dns-port=10053
         - --config-map=kube-dns
-        - --v=0
+        - --v=2
         - --kube_master_url=http://{{ private_address }}:8080
         {{ pillar['federations_domain_map'] }}
         env: