From f7f51fab2a01d2d529593934f43415fe3a93fd8f Mon Sep 17 00:00:00 2001
From: Yubao Liu <yubao.liu@gmail.com>
Date: Sun, 7 Apr 2019 20:41:25 +0800
Subject: [PATCH] change default 5s ttl to 30s for coredns to be same with
 kube-dns/dnsmasq

---
 cluster/addons/dns/coredns/coredns.yaml.base   | 1 +
 cluster/addons/dns/coredns/coredns.yaml.in     | 1 +
 cluster/addons/dns/coredns/coredns.yaml.sed    | 1 +
 cmd/kubeadm/app/phases/addons/dns/manifests.go | 1 +
 test/e2e/network/dns_configmap.go              | 5 +++++
 5 files changed, 9 insertions(+)

diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base
index 6936dc792158..efc946b144ad 100644
--- a/cluster/addons/dns/coredns/coredns.yaml.base
+++ b/cluster/addons/dns/coredns/coredns.yaml.base
@@ -68,6 +68,7 @@ data:
             pods insecure
             upstream
             fallthrough in-addr.arpa ip6.arpa
+            ttl 30
         }
         prometheus :9153
         forward . /etc/resolv.conf
diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in
index 0821820fd2a9..17bb9de0320c 100644
--- a/cluster/addons/dns/coredns/coredns.yaml.in
+++ b/cluster/addons/dns/coredns/coredns.yaml.in
@@ -68,6 +68,7 @@ data:
             pods insecure
             upstream
             fallthrough in-addr.arpa ip6.arpa
+            ttl 30
         }
         prometheus :9153
         forward . /etc/resolv.conf
diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed
index 38688ced3060..53910bb65070 100644
--- a/cluster/addons/dns/coredns/coredns.yaml.sed
+++ b/cluster/addons/dns/coredns/coredns.yaml.sed
@@ -68,6 +68,7 @@ data:
             pods insecure
             upstream
             fallthrough in-addr.arpa ip6.arpa
+            ttl 30
         }
         prometheus :9153
         forward . /etc/resolv.conf
diff --git a/cmd/kubeadm/app/phases/addons/dns/manifests.go b/cmd/kubeadm/app/phases/addons/dns/manifests.go
index 3069c12dd167..34f2adc36791 100644
--- a/cmd/kubeadm/app/phases/addons/dns/manifests.go
+++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go
@@ -318,6 +318,7 @@ data:
            pods insecure
            upstream
            fallthrough in-addr.arpa ip6.arpa
+           ttl 30
         }{{ .Federation }}
         prometheus :9153
         forward . {{ .UpstreamNameserver }}
diff --git a/test/e2e/network/dns_configmap.go b/test/e2e/network/dns_configmap.go
index 5426daba4431..c979e917dba8 100644
--- a/test/e2e/network/dns_configmap.go
+++ b/test/e2e/network/dns_configmap.go
@@ -71,6 +71,7 @@ func (t *dnsFederationsConfigMapTest) run() {
             pods insecure
             upstream
             fallthrough in-addr.arpa ip6.arpa
+            ttl 30
         }
         federation %v {
            abc def.com
@@ -86,6 +87,7 @@ func (t *dnsFederationsConfigMapTest) run() {
             pods insecure
             upstream
             fallthrough in-addr.arpa ip6.arpa
+            ttl 30
         }
         federation %v {
            ghi xyz.com
@@ -235,6 +237,7 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
            pods insecure
            upstream
            fallthrough in-addr.arpa ip6.arpa
+           ttl 30
         }
         forward . %v
     }
@@ -333,6 +336,7 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
            pods insecure
            upstream
            fallthrough in-addr.arpa ip6.arpa
+           ttl 30
         }
         forward . %v
     }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP),
@@ -443,6 +447,7 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
            pods insecure
            upstream
            fallthrough in-addr.arpa ip6.arpa
+           ttl 30
         }
         forward . %v
     }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP),