summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-10-29 14:01:51 +0000
committerGerrit Code Review <gerrit@onap.org>2021-10-29 14:01:51 +0000
commita43346dbbc3771e8ae15920393df097d21eeb3a1 (patch)
tree5d8eb020261423a86060627cbaba1a106e79a6e8
parent6bfeb8d7f434f03795e1e2fa7db4289a32925df7 (diff)
parent91f8aee27c74b80378bba0f6896029db58d95597 (diff)
Merge changes from topic "Istanbul-doc-update"
* changes: [DOC] Remove Guilin infra tools compatibility note [DOC] Upgrade kubectl and helm versions
-rw-r--r--docs/oom_cloud_setup_guide.rst4
-rw-r--r--docs/oom_user_guide.rst6
2 files changed, 3 insertions, 7 deletions
diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index 70f5190e8a..4b3ec92ccb 100644
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -60,10 +60,6 @@ The versions of Kubernetes that are supported by OOM are as follows:
Istanbul 1.19.11 3.6.3 1.19.11 19.03.x 1.5.4
============== =========== ======= ======== ======== ============
-.. 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
==============================
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index e0cf17c4b1..74f8c57f6e 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -64,7 +64,7 @@ Enter the following to install kubectl (on Ubuntu, there are slight differences
on other O/Ss), the Kubernetes command line interface used to manage a
Kubernetes cluster::
- > curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.15.11/bin/linux/amd64/kubectl
+ > curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.11/bin/linux/amd64/kubectl
> chmod +x ./kubectl
> sudo mv ./kubectl /usr/local/bin/kubectl
> mkdir ~/.kube
@@ -88,8 +88,8 @@ Install Helm
Helm is used by OOM for package and configuration management. To install Helm,
enter the following::
- > wget https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz
- > tar -zxvf helm-v3.5.2-linux-amd64.tar.gz
+ > wget https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz
+ > tar -zxvf helm-v3.6.3-linux-amd64.tar.gz
> sudo mv linux-amd64/helm /usr/local/bin/helm
Verify the Helm version with::