From 742481cc7b48285ade05b25f142642536108936f Mon Sep 17 00:00:00 2001 From: Stephen Greene Date: Wed, 24 Feb 2021 13:10:32 -0500 Subject: [PATCH] Corefile: Drop deprecated kubernetes `upstream` option https://github.com/coredns/coredns/pull/3737 removed the unused `upstream` kubernetes plugin option from the CoreDNS corefile parser. Starting in CoreDNS v1.7, corefiles that have the `upstream` option will throw an error. This change should not affect functionality since the `upstream` option has been ignored since CoreDNS v1.5. The aforementioned upstream CoreDNS PR merely requires that the `upstream` option be removed for the kubernetes plugin section of a corefile. --- pkg/operator/controller/controller_dns_configmap.go | 1 - pkg/operator/controller/controller_dns_configmap_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/pkg/operator/controller/controller_dns_configmap.go b/pkg/operator/controller/controller_dns_configmap.go index f9e765a3f..5c0c1ece1 100644 --- a/pkg/operator/controller/controller_dns_configmap.go +++ b/pkg/operator/controller/controller_dns_configmap.go @@ -34,7 +34,6 @@ var corefileTemplate = template.Must(template.New("Corefile").Parse(`{{range .Se health kubernetes {{.ClusterDomain}} in-addr.arpa ip6.arpa { pods insecure - upstream fallthrough in-addr.arpa ip6.arpa } prometheus 127.0.0.1:9153 diff --git a/pkg/operator/controller/controller_dns_configmap_test.go b/pkg/operator/controller/controller_dns_configmap_test.go index 8a82c0dfe..d4aa0b3b5 100644 --- a/pkg/operator/controller/controller_dns_configmap_test.go +++ b/pkg/operator/controller/controller_dns_configmap_test.go @@ -46,7 +46,6 @@ bar.com:5353 example.com:5353 { health kubernetes cluster.local in-addr.arpa ip6.arpa { pods insecure - upstream fallthrough in-addr.arpa ip6.arpa } prometheus 127.0.0.1:9153