Merge pull request kubernetes#78920 from rajansandeep/addupstream

k8s-ci-robot · web-flow · commit 56b40066d55d · 2019-06-11T18:13:28.000-07:00
Add `upstream` option to CoreDNS ConfigMap
diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base
@@ -66,6 +66,7 @@ data:
         health
         kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
             pods insecure
+            upstream
             fallthrough in-addr.arpa ip6.arpa
             ttl 30
         }
diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in
@@ -66,6 +66,7 @@ data:
         health
         kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
             pods insecure
+            upstream
             fallthrough in-addr.arpa ip6.arpa
             ttl 30
         }
diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed
@@ -66,6 +66,7 @@ data:
         health
         kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
             pods insecure
+            upstream
             fallthrough in-addr.arpa ip6.arpa
             ttl 30
         }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ data:`
`66`	`66`	`health`
`67`	`67`	`kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {`
`68`	`68`	`pods insecure`
	`69`	`+ upstream`
`69`	`70`	`fallthrough in-addr.arpa ip6.arpa`
`70`	`71`	`ttl 30`
`71`	`72`	`}`