Update UE-DNS config creation
Change-Id: I8fcaab5979dc418579f1516da58360892276b3da
diff --git a/edge_deployment/bess_upf_deployment.rst b/edge_deployment/bess_upf_deployment.rst
index 21adb1e..dbf455b 100644
--- a/edge_deployment/bess_upf_deployment.rst
+++ b/edge_deployment/bess_upf_deployment.rst
@@ -86,7 +86,7 @@
The configuration below is for the example environment.
Don't forget to replace the IP addresses in the example configuration with the addresses of the actual cluster.
-.. code-block:: shell
+.. code-block:: yaml
$ cd $WORKDIR/aether-app-configs/apps/bess-upf/upf1
$ mkdir overlays/prd-ace-test
@@ -113,7 +113,7 @@
Update ``fleet.yaml`` in the same directory to let Fleet know the custom configuration.
-.. code-block:: shell
+.. code-block:: yaml
$ vi fleet.yaml
# add following block at the end
@@ -126,7 +126,7 @@
- overlays/prd-ace-test/values.yaml
-Commit your changes.
+Submit your changes.
.. code-block:: shell
diff --git a/edge_deployment/runtime_deployment.rst b/edge_deployment/runtime_deployment.rst
index e603668..b89bad7 100644
--- a/edge_deployment/runtime_deployment.rst
+++ b/edge_deployment/runtime_deployment.rst
@@ -107,7 +107,7 @@
with the new cluster name as selector like the example below.
Don't forget to replace ``ace-test`` in the example to the new cluster name.
-.. code-block:: shell
+.. code-block:: yaml
$ cd $WORKDIR/aether-app-configs/infrastructure/rancher-monitoring
$ vi fleet.yaml
@@ -134,21 +134,61 @@
Configure ue-dns
################
-For UE-DNS, you are required to generate a Helm value for the new cluster.
-You can use the same ``Makefile`` that you used for generating the runtime configs for this.
+For UE-DNS, you are required to create Helm values for the new cluster.
+You'll need cluster domain and kube-dns ClusterIP address. Both can be found in
+``aether-pod-configs/production/cluster_map.tfvars``.
+Be sure to replace ``[ ]`` in the example configuration below to the actual cluster value.
-.. code-block:: shell
+.. code-block:: yaml
$ cd $WORKDIR/aether-app-configs/infrastructure/coredns
$ mkdir overlays/prd-ace-test
+ $ vi overlays/prd-ace-test/values.yaml
+ # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
- $ cd $WORKDIR/aether-pod-configs/tools
- $ make uedns > $WORKDIR/aether-app-configs/infrastructure/coredns/overlays/prd-ace-test/values.yaml
+ serviceType: ClusterIP
+ service:
+ clusterIP: [next address of the kube-dns ip]
+ servers:
+ - zones:
+ - zone: .
+ port: 53
+ plugins:
+ - name: errors
+ - name: health
+ configBlock: |-
+ lameduck 5s
+ - name: ready
+ - name: prometheus
+ parameters: 0.0.0.0:9153
+ - name: forward
+ parameters: . /etc/resolv.conf
+ - name: cache
+ parameters: 30
+ - name: loop
+ - name: reload
+ - name: loadbalance
+ - zones:
+ - zone: aetherproject.net
+ port: 53
+ plugins:
+ - name: errors
+ - name: rewrite continue
+ configBlock: |-
+ name regex (.*)\.aetherproject.net {1}.svc.[cluster domain]
+ answer name (.*)\.svc\.[cluster domain] {1}.aetherproject.net
+ - name: forward
+ parameters: . [kube-dns ip]
+ configBlock: |-
+ except kube-system.svc.[cluster domain] aether-sdcore.svc.[cluster domain] tost.svc.[cluster domain]
+ - name: cache
+ parameters: 30
-Update ``fleet.yaml`` under ``infrastructure/coredns`` for the new cluster and specify the Helm values file
-you just created.
-.. code-block:: shell
+Next, update ``fleet.yaml`` under ``infrastructure/coredns`` so that Fleet can use the custom configuration
+you just created when deploying UE-DNS to the cluster.
+
+.. code-block:: yaml
$ cd $WORKDIR/aether-app-configs/infrastructure/coredns
$ vi fleet.yaml
@@ -162,7 +202,7 @@
- overlays/prd-ace-test/values.yaml
-Commit your changes.
+Submit your changes.
.. code-block:: shell
diff --git a/edge_deployment/vpn_bootstrap.rst b/edge_deployment/vpn_bootstrap.rst
index 36e3ad9..08041d9 100644
--- a/edge_deployment/vpn_bootstrap.rst
+++ b/edge_deployment/vpn_bootstrap.rst
@@ -49,7 +49,7 @@
+ pod: 'production'
+ cluster: 'ace-test'
-Commit your change and wait for the jobs you just added available in Aether Jenkins.
+Submit your change and wait for the jobs you just added available in Aether Jenkins.
.. code-block:: shell
@@ -239,7 +239,7 @@
Created ../production/ace-test/ansible/extra_vars.yml
-Commit your change
+Submit your change
------------------
.. code-block:: shell