[DOC] Update London OOM documentation

[oom.git] / docs / sections / guides / infra_guides / oom_infra_deployment_requirements.rst

diff --git a/docs/sections/guides/infra_guides/oom_infra_setup.rst b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
similarity index 60%
rename from docs/sections/guides/infra_guides/oom_infra_setup.rst
rename to docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
index ed7b05a..1b9db50 100644 (file)
--- a/docs/sections/guides/infra_guides/oom_infra_setup.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
@@ -6,21 +6,12 @@
 .. Links
 .. _Kubernetes: https://kubernetes.io/
 .. _Kubernetes best practices: https://kubernetes.io/docs/setup/best-practices/cluster-large/
-.. _kubelet confg guide: https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/
+.. _kubelet config guide: https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/
 
-.. _oom_infra_setup_guide:
 
-OOM Infrastructure Guide
-########################
 
-.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
-   :align: right
-
-OOM deploys and manages ONAP on a pre-established Kubernetes_ cluster - the
-creation of this cluster is outside of the scope of the OOM project as there
-are many options including public clouds with pre-established environments.
-If creation of a Kubernetes cluster is required, the life-cycle of this
-cluster is independent of the life-cycle of the ONAP components themselves.
+ONAP Deployment Requirements
+============================
 
 .. rubric::  Minimum Hardware Configuration
 
@@ -40,7 +31,7 @@ See the :ref:`OOM customized deployment<oom_customize_overrides>` section for mo
 
 .. note::
     | Kubernetes supports a maximum of 110 pods per node - this can be overcome by modifying your kubelet config.
-    | See the `kubelet confg guide`_ for more information.
+    | See the `kubelet config guide`_ for more information.
 
     | The use of many small nodes is preferred over a few larger nodes (for example 14 x 16GB - 8 vCores each).
 
@@ -54,28 +45,28 @@ The versions of software that are supported by OOM are as follows:
 
 .. table:: OOM Software Requirements (base)
 
-  ==============     ===========  =======  ========  ========  ============  =======
-  Release            Kubernetes   Helm     kubectl   Docker    Cert-Manager  Strimzi
-  ==============     ===========  =======  ========  ========  ============  =======
-  Jakarta            1.22.4       3.6.3    1.22.4    20.10.x   1.8.0         0.28.0
-  Kohn               1.23.8       3.8.2    1.23.8    20.10.x   1.8.0         0.32.0
-  ==============     ===========  =======  ========  ========  ============  =======
-
-.. table:: OOM Software Requirements (optional)
-
-  ==============     =================  ======
-  Release            Prometheus Stack   Istio
-  ==============     =================  ======
-  Jakarta            35.x               ---
-  Kohn               35.x               1.15.1
-  ==============     =================  ======
-
+  ==============     ===========  =======  ========  ========  =============  ========
+  Release            Kubernetes   Helm     kubectl   Docker    Cert-Manager   Strimzi
+  ==============     ===========  =======  ========  ========  =============  ========
+  Jakarta            1.22.4       3.6.3    1.22.4    20.10.x   1.8.0          0.28.0
+  Kohn               1.23.8       3.8.2    1.23.8    20.10.x   1.8.0          0.32.0
+  London             1.23.8       3.8.2    1.23.x    20.10.x   1.11.1         0.35.0
+  ==============     ===========  =======  ========  ========  =============  ========
 
-.. toctree::
-  :hidden:
+.. table:: OOM Software Requirements (production)
 
-  oom_base_config_setup.rst
-  oom_base_optional_addons.rst
-  oom_setup_ingress_controller.rst
+  ==============     ======  ============ ==============
+  Release            Istio   Gateway-API  Keycloak
+  ==============     ======  ============ ==============
+  London             1.17.2  v0.6.2       19.0.3-legacy
+  ==============     ======  ============ ==============
 
+.. table:: OOM Software Requirements (optional)
 
+  ==============     ================= ==========
+  Release            Prometheus Stack  K8ssandra
+  ==============     ================= ==========
+  Jakarta            35.x
+  Kohn               35.x
+  London             45.x              1.6.1
+  ==============     ================= ==========