Skip to content

Commit db66e39

Browse files
authored
Merge pull request kubernetes#128359 from matteriben/disable-caching-for-authoritative-zone
disable caching for authoritative zone to comply with rfc-1035 section 6.1.2
2 parents a93e3e7 + 30d9ed7 commit db66e39

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

cmd/kubeadm/app/phases/addons/dns/dns_test.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,10 @@ func TestCreateCoreDNSAddon(t *testing.T) {
184184
forward . /etc/resolv.conf {
185185
max_concurrent 1000
186186
}
187-
cache 30
187+
cache 30 {
188+
disable success cluster.local
189+
disable denial cluster.local
190+
}
188191
loop
189192
reload
190193
loadbalance
@@ -228,7 +231,10 @@ func TestCreateCoreDNSAddon(t *testing.T) {
228231
forward . /etc/resolv.conf {
229232
max_concurrent 1000
230233
}
231-
cache 30
234+
cache 30 {
235+
disable success cluster.local
236+
disable denial cluster.local
237+
}
232238
loop
233239
reload
234240
loadbalance
@@ -314,7 +320,10 @@ func TestCreateCoreDNSAddon(t *testing.T) {
314320
forward . /etc/resolv.conf {
315321
max_concurrent 1000
316322
}
317-
cache 30
323+
cache 30 {
324+
disable success cluster.local
325+
disable denial cluster.local
326+
}
318327
loop
319328
reload
320329
loadbalance

cmd/kubeadm/app/phases/addons/dns/manifests.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ data:
178178
max_concurrent 1000
179179
}
180180
cache 30
181+
{{- if .DNSDomain }} {
182+
disable success {{ .DNSDomain }}
183+
disable denial {{ .DNSDomain }}
184+
}
185+
{{- end }}
181186
loop
182187
reload
183188
loadbalance

0 commit comments

Comments
 (0)