From 2b07b326c4423b10b3136ee1e22e7a63028b0034 Mon Sep 17 00:00:00 2001
From: natemollica-dev <57850649+natemollica-nm@users.noreply.github.com>
Date: Thu, 1 Feb 2024 14:00:27 -0800
Subject: [PATCH] Resolve Consul DNS in OpenShift (#20439)

---
 .changelog/20439.txt             |  3 ++
 website/content/docs/k8s/dns.mdx | 64 ++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 .changelog/20439.txt

diff --git a/.changelog/20439.txt b/.changelog/20439.txt
new file mode 100644
index 0000000000..1dd027d3d1
--- /dev/null
+++ b/.changelog/20439.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+docs: Consul DNS Forwarding configuration for OpenShift update for [Resolve Consul DNS Requests in Kubernetes](https://developer.hashicorp.com/consul/docs/k8s/dns)
+```
diff --git a/website/content/docs/k8s/dns.mdx b/website/content/docs/k8s/dns.mdx
index 0f34dd2507..8e713a86e1 100644
--- a/website/content/docs/k8s/dns.mdx
+++ b/website/content/docs/k8s/dns.mdx
@@ -134,6 +134,70 @@ in full cluster rebuilds.
 
 -> **Note:** If using a different zone than `.consul`, change the key accordingly.
 
+## OpenShift DNS Operator
+
+-> **Note:** OpenShift CLI `oc` is utilized below complete the following steps. You can find more details on how to install OpenShift CLI from [Getting started with OpenShift CLI](https://docs.openshift.com/container-platform/latest/cli_reference/openshift_cli/getting-started-cli.html).
+
+You can use DNS forwarding to override the default forwarding configuration in the `/etc/resolv.conf` file by specifying
+the `consul-dns` service for the `consul` subdomain (zone).
+
+Find `consul-dns` service clusterIP:
+
+```shell-session
+$ oc get svc consul-dns --namespace consul --output jsonpath='{.spec.clusterIP}'
+172.30.186.254
+```
+
+Edit the `default` DNS Operator:
+
+```shell-session
+$ oc edit edit dns.operator/default
+```
+
+Append the following `servers` section entry to the `spec` section of the DNS Operator configuration:
+
+```yaml
+spec:
+  servers:
+  - name: consul-server
+    zones:
+    - consul
+    forwardPlugin:
+      policy: Random
+      upstreams:
+      - 172.30.186.254 # Set to clusterIP of consul-dns service
+```
+
+Save the configuration changes and verify the `dns-default` configmap has been updated:
+
+```shell-session
+$ oc get configmap/dns-default -n openshift-dns -o yaml
+```
+
+Example output with updated `consul` forwarding zone:
+
+```yaml
+...
+data:
+  Corefile: |
+    # consul-server
+    consul:5353 {
+        prometheus 127.0.0.1:9153
+        forward . 172.30.186.254 {
+            policy random
+        }
+        errors
+        log . {
+            class error
+        }
+        bufsize 1232
+        cache 900 {
+            denial 9984 30
+        }
+    }
+...
+```
+
 ## Verifying DNS Works
 
 To verify DNS works, run a simple job to query DNS. Save the following