[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 e54992e..6906289 100644 (file)
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -15,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
 
 .. _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:
    :align: right
 
 .. _cloud-setup-guide-label:


@@ -46,9 +46,9 @@ The versions of Kubernetes that are supported by OOM are as follows:
 
 .. table:: OOM Software Requirements
 
 
 .. table:: OOM Software Requirements
 

-  ==============     ===========  =======  ========  ========
-  Release            Kubernetes   Helm     kubectl   Docker
-  ==============     ===========  =======  ========  ========
+  ==============     ===========  =======  ========  ======== ============
+  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
   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


@@ -56,11 +56,10 @@ The versions of Kubernetes that are supported by OOM are as follows:
   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
   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

-  ==============     ===========  =======  ========  ========
-
-.. note::
-  Guilin version also supports Kubernetes up to version 1.19.x and should work
-  with Helm with version up to 3.3.x but has not been thoroughly tested.
+  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
 ==============================
 
 Minimum Hardware Configuration
 ==============================


@@ -78,10 +77,11 @@ components that are needed will drastically reduce the requirements.
   =====  =====  ======  ====================
 
 .. note::
   =====  =====  ======  ====================
 
 .. 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
   Subsets of ONAP may still be deployed on a single node.
 
 Cloud Installation