diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base index 6936dc7921..efc946b144 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 0821820fd2..17bb9de032 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 38688ced30..53910bb650 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 3069c12dd1..34f2adc367 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 df939f4e97..1cb384b504 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),