[DOCS] Clean up docs etc

[oom.git] / docs / oom_cloud_setup_guide.rst

diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index 899f0d7..6906289 100644 (file)
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -1,7 +1,8 @@
 .. This work is licensed under a Creative Commons Attribution 4.0
 .. International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2019 Amdocs, Bell Canada
+.. Copyright 2019-2020 Amdocs, Bell Canada, Orange, Samsung
+.. _oom_cloud_setup_guide:
 
 .. Links
 .. _Microsoft Azure: https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-MicrosoftAzure
@@ -14,7 +15,7 @@
 .. _Cloud Native Deployment Wiki: https://wiki.onap.org/display/DW/Cloud+Native+Deployment
 .. _ONAP Development - 110 pod limit Wiki: https://wiki.onap.org/display/DW/ONAP+Development#ONAPDevelopment-Changemax-podsfromdefault110podlimit
 
-.. figure:: oomLogoV2-medium.png
+.. figure:: images/oom_logo/oomLogoV2-medium.png
    :align: right
 
 .. _cloud-setup-guide-label:
@@ -45,15 +46,20 @@ The versions of Kubernetes that are supported by OOM are as follows:
 
 .. table:: OOM Software Requirements
 
-  ==============     ===========  ======  ========  ========
-  Release            Kubernetes   Helm    kubectl   Docker
-  ==============     ===========  ======  ========  ========
-  amsterdam          1.7.x        2.3.x   1.7.x     1.12.x
-  beijing            1.8.10       2.8.2   1.8.10    17.03.x
-  casablanca         1.11.5       2.9.1   1.11.5    17.03.x
-  dublin             1.13.5       2.12.3  1.13.5    18.09.5
-  el alto            1.15.2       2.14.2  1.15.2    18.09.x
-  ==============     ===========  ======  ========  ========
+  ==============     ===========  =======  ========  ======== ============
+  Release            Kubernetes   Helm     kubectl   Docker   Cert-Manager
+  ==============     ===========  =======  ========  ======== ============
+  amsterdam          1.7.x        2.3.x    1.7.x     1.12.x
+  beijing            1.8.10       2.8.2    1.8.10    17.03.x
+  casablanca         1.11.5       2.9.1    1.11.5    17.03.x
+  dublin             1.13.5       2.12.3   1.13.5    18.09.5
+  el alto            1.15.2       2.14.2   1.15.2    18.09.x
+  frankfurt          1.15.9       2.16.6   1.15.11   18.09.x
+  guilin             1.15.11      2.16.10  1.15.11   18.09.x
+  honolulu           1.19.9       3.5.2    1.19.9    19.03.x   1.2.0
+  Istanbul           1.19.11      3.6.3    1.19.11   19.03.x   1.5.4
+  Jakarta            1.22.4       3.6.3    1.22.4    20.10.x   1.5.4
+  ==============     ===========  =======  ========  ======== ============
 
 Minimum Hardware Configuration
 ==============================
@@ -71,10 +77,11 @@ components that are needed will drastically reduce the requirements.
   =====  =====  ======  ====================
 
 .. note::
-  Kubernetes supports a maximum of 110 pods per node - configurable in the --max-pods=n setting off the
-  "additional kubelet flags" box in the kubernetes template window described in 'ONAP Development - 110 pod limit Wiki'
-  - this limit does not need to be modified . The use of many small
-  nodes is preferred over a few larger nodes (for example 14x16GB - 8 vCores each).
+  Kubernetes supports a maximum of 110 pods per node - configurable in the
+  --max-pods=n setting off the "additional kubelet flags" box in the kubernetes
+  template window described in 'ONAP Development - 110 pod limit Wiki'
+  - this limit does not need to be modified . The use of many small nodes is
+  preferred over a few larger nodes (for example 14x16GB - 8 vCores each).
   Subsets of ONAP may still be deployed on a single node.
 
 Cloud Installation
@@ -90,9 +97,9 @@ Cloud Installation
 ..    - IBM, and
 ..    - `Openstack`_.
 ..
-.. #. Alternatively, OOM can be deployed on a private set of physical hosts or VMs
-..    (or even a combination of the two). The following guides describe how to
-..    create a Kubernetes cluster with popular tools:
+.. #. Alternatively, OOM can be deployed on a private set of physical hosts or
+..    VMs (or even a combination of the two). The following guides describe how
+..    to create a Kubernetes cluster with popular tools:
 ..
 ..    - `Setting up Kubernetes with Rancher`_ (recommended)
 ..    - `Setting up Kubernetes with Kubeadm`_
@@ -102,4 +109,5 @@ OOM can be deployed on a private set of physical hosts or VMs (or even a
 combination of the two). The following guide describe the recommended method to
 setup a Kubernetes cluster: :ref:`onap-on-kubernetes-with-rancher`.
 
-There are alternative deployment methods described on the `Cloud Native Deployment Wiki`_
+There are alternative deployment methods described on the
+`Cloud Native Deployment Wiki`_