Merge pull request #2122 from cybertron/bm-forward-seq

Bug 1882209: baremetal & friends: Set coredns forward policy to sequential
openshift · Jan 21, 2021 · 2c59140 · 2c59140
2 parents 40d8e4f + 0d7e44e
commit 2c59140
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/manifests/on-prem/coredns-corefile.tmpl b/manifests/on-prem/coredns-corefile.tmpl
@@ -2,7 +2,9 @@
     errors
     health :18080
     mdns {{ .ControllerConfig.DNS.Spec.BaseDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}} {{`{{.NonVirtualIP}}`}}
-    forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
+    forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}} {
+        policy sequential
+    }
     cache 30
     reload
     template IN {{`{{ .Cluster.IngressVIPRecordType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
diff --git a/templates/common/on-prem/files/coredns-corefile.yaml b/templates/common/on-prem/files/coredns-corefile.yaml
@@ -6,7 +6,9 @@ contents:
         errors
         health :18080
         mdns {{ .DNS.Spec.BaseDomain }} 0 {{`{{.Cluster.Name}}`}} {{`{{.NonVirtualIP}}`}}
-        forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
+        forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}} {
+            policy sequential
+        }
         cache 30
         reload
         template IN {{`{{ .Cluster.IngressVIPRecordType }}`}} {{ .DNS.Spec.BaseDomain }} {

diff --git a/templates/common/ovirt/files/coredns-corefile.yaml b/templates/common/ovirt/files/coredns-corefile.yaml
@@ -6,7 +6,9 @@ contents:
         errors
         health :18080
         mdns {{ .DNS.Spec.BaseDomain }} 0 {{`{{.Cluster.Name}}`}} {{`{{.NonVirtualIP}}`}}
-        forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
+        forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}} {
+            policy sequential
+        }
         cache 30
         reload
         file /etc/coredns/node-dns-db {{ .DNS.Spec.BaseDomain }}

diff --git a/templates/common/vsphere/files/coredns-corefile.yaml b/templates/common/vsphere/files/coredns-corefile.yaml
@@ -7,7 +7,9 @@ contents:
         errors
         health :18080
         mdns {{ .DNS.Spec.BaseDomain }} 0 {{`{{.Cluster.Name}}`}} {{`{{.NonVirtualIP}}`}}
-        forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
+        forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}} {
+            policy sequential
+        }
         cache 30
         reload
         hosts {