X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docs%2Foom_cloud_setup_guide.rst;h=e54992e852c0d98f563a8e2d1f939f110aef8cd8;hb=4f9902b6e7b5c70588160266276904ab81832867;hp=899f0d7e654d86677cdbc108c94a5b6f3cbabdb7;hpb=c8c79af678e8ad916a3cc766acc0e931ea3184a2;p=oom.git

diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index 899f0d7e65..e54992e852 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,15 +46,21 @@ 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
+  ==============     ===========  =======  ========  ========
+  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
+  ==============     ===========  =======  ========  ========
+
+.. 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
 ==============================
@@ -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`_