Skip to content

K
k3s
Unverified Commit 888b81b6 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #76238 from Dieken/30s-ttl-for-coredns

change default 5s ttl to 30s for coredns to be same with kube-dns/dnsmasq
parents e6390ce3 f7f51fab
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
cluster/addons/dns/coredns/coredns.yaml.base
View file @ 888b81b6
...@@ -68,6 +68,7 @@ data: ...@@ -68,6 +68,7 @@ data:
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
prometheus :9153 prometheus :9153
forward . /etc/resolv.conf forward . /etc/resolv.conf
......
cluster/addons/dns/coredns/coredns.yaml.in
View file @ 888b81b6
...@@ -68,6 +68,7 @@ data: ...@@ -68,6 +68,7 @@ data:
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
prometheus :9153 prometheus :9153
forward . /etc/resolv.conf forward . /etc/resolv.conf
......
cluster/addons/dns/coredns/coredns.yaml.sed
View file @ 888b81b6
...@@ -68,6 +68,7 @@ data: ...@@ -68,6 +68,7 @@ data:
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
prometheus :9153 prometheus :9153
forward . /etc/resolv.conf forward . /etc/resolv.conf
......
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @ 888b81b6
...@@ -318,6 +318,7 @@ data: ...@@ -318,6 +318,7 @@ data:
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
}{{ .Federation }} }{{ .Federation }}
prometheus :9153 prometheus :9153
forward . {{ .UpstreamNameserver }} forward . {{ .UpstreamNameserver }}
......
test/e2e/network/dns_configmap.go
View file @ 888b81b6
...@@ -71,6 +71,7 @@ func (t *dnsFederationsConfigMapTest) run() { ...@@ -71,6 +71,7 @@ func (t *dnsFederationsConfigMapTest) run() {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
federation %v { federation %v {
abc def.com abc def.com
...@@ -86,6 +87,7 @@ func (t *dnsFederationsConfigMapTest) run() { ...@@ -86,6 +87,7 @@ func (t *dnsFederationsConfigMapTest) run() {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
federation %v { federation %v {
ghi xyz.com ghi xyz.com
...@@ -235,6 +237,7 @@ func (t *dnsNameserverTest) run(isIPv6 bool) { ...@@ -235,6 +237,7 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
forward . %v forward . %v
} }
...@@ -333,6 +336,7 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) { ...@@ -333,6 +336,7 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
forward . %v forward . %v
}`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP), }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP),
...@@ -443,6 +447,7 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) { ...@@ -443,6 +447,7 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30
} }
forward . %v forward . %v
}`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP), }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment