X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docs%2Foom_cloud_setup_guide.rst;h=adebcba487d30e7e653bcd4feacbea72230d193c;hb=f3319a860f7811df33f4b6359a10497aa38b03ff;hp=1ce260efbf685809dab93271887288c53854747f;hpb=e2a4520e6c14ca2220631408a1f9c1410a4dee15;p=oom.git

diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index 1ce260efbf..adebcba487 100644
--- 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
@@ -45,14 +46,23 @@ 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
-  ==============     ===========  ======  ========  ========
+  ==============     ===========  =======  ========  ======== ============
+  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
+  Istanbul                                                    1.2.0
+  ==============     ===========  =======  ========  ======== ============
+
+.. 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.
 
 Minimum Hardware Configuration
 ==============================
@@ -70,10 +80,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
@@ -89,9 +100,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`_
@@ -101,4 +112,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`_