github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-23 06:20:09 -07:00 committed by GitHub
parent e6390ce3ff f7f51fab2a
commit 888b81b638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/dns/coredns/coredns.yaml.base
View File

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

1
cluster/addons/dns/coredns/coredns.yaml.in
View File

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

1
cluster/addons/dns/coredns/coredns.yaml.sed
View File

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

1
cmd/kubeadm/app/phases/addons/dns/manifests.go
View File

@ -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 }}

5
test/e2e/network/dns_configmap.go
View File

@ -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() {
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) {
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) {
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) {
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),