diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/oom_cloud_setup_guide.rst | 13 | ||||
| -rw-r--r-- | docs/oom_setup_kubernetes_rancher.rst | 2 | ||||
| -rw-r--r-- | docs/oom_user_guide.rst | 34 | ||||
| -rw-r--r-- | docs/openstack-k8s-node.sh | 2 | ||||
| -rw-r--r-- | docs/openstack-rancher.sh | 4 |
5 files changed, 34 insertions, 21 deletions
diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst index 73509669e8..4fe943cf18 100644 --- a/docs/oom_cloud_setup_guide.rst +++ b/docs/oom_cloud_setup_guide.rst @@ -45,12 +45,13 @@ 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/master 1.8.10 2.8.2 1.8.10 17.03.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/master 1.8.10 2.9.1 1.8.10 17.03.x + ============== ========== ===== ======= ======== Minimum Hardware Configuration ============================== diff --git a/docs/oom_setup_kubernetes_rancher.rst b/docs/oom_setup_kubernetes_rancher.rst index 0914ed2ace..a20c0dfe96 100644 --- a/docs/oom_setup_kubernetes_rancher.rst +++ b/docs/oom_setup_kubernetes_rancher.rst @@ -442,7 +442,7 @@ and show running pods:: will be displayed:: ubuntu@sb4-k8s-1:~$ helm list - Error: incompatible versions c1ient[v2.8.2] server[v2.6.1] + Error: incompatible versions c1ient[v2.9.1] server[v2.6.1] ubuntu@sb4-k8s-1:~$ 7. Upgrade the server-side component of helm (tiller) via `helm init --upgrade`:: diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst index f79de5950f..f20097d927 100644 --- a/docs/oom_user_guide.rst +++ b/docs/oom_user_guide.rst @@ -75,8 +75,8 @@ Install Helm ~~~~~~~~~~~~ Helm is used by OOM for package and configuration management. To install Helm, enter the following:: - > wget http://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz - > tar -zxvf helm-v2.8.2-linux-amd64.tar.gz + > wget http://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz + > tar -zxvf helm-v2.9.1-linux-amd64.tar.gz > sudo mv linux-amd64/helm /usr/local/bin/helm Verify the Helm version with:: @@ -391,16 +391,28 @@ Ensure you've disabled any proxy settings the browser you are using to access the portal and then simply access the familiar URL: http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm -.. note:: Alternatives Considered. - Kubernetes port forwarding was considered but discarded as it would require - the end user to run a script that opens up port forwarding tunnels to each of - the pods that provides a portal application widget. +.. note:: - Reverting to a VNC server similar to what was deployed in the Amsterdam - release was also considered but there were many issues with resolution, lack - of volume mount, /etc/hosts dynamic update, file upload that were a tall order - to solve in time for the Beijing release. + | Alternatives Considered: + + - Kubernetes port forwarding was considered but discarded as it would require + the end user to run a script that opens up port forwarding tunnels to each of + the pods that provides a portal application widget. + + - Reverting to a VNC server similar to what was deployed in the Amsterdam + release was also considered but there were many issues with resolution, lack + of volume mount, /etc/hosts dynamic update, file upload that were a tall order + to solve in time for the Beijing release. + + Observations: + + - If you are not using floating IPs in your Kubernetes deployment and directly attaching + a public IP address (i.e. by using your public provider network) to your K8S Node + VMs' network interface, then the output of 'kubectl -n onap get services | grep "portal-app"' + will show your public IP instead of the private network's IP. Therefore, + you can grab this public IP directly (as compared to trying to find the floating + IP first) and map this IP in /etc/hosts. .. figure:: oomLogoV2-Monitor.png :align: right @@ -675,4 +687,4 @@ deployment enter:: will remove `so` as the configuration indicates it's no longer part of the deployment. This might be useful if a one wanted to replace just `so` by -installing a custom version. +installing a custom version. diff --git a/docs/openstack-k8s-node.sh b/docs/openstack-k8s-node.sh index 7d49ad5033..66dc629398 100644 --- a/docs/openstack-k8s-node.sh +++ b/docs/openstack-k8s-node.sh @@ -2,7 +2,7 @@ DOCKER_VERSION=17.03 KUBECTL_VERSION=1.8.10 -HELM_VERSION=2.8.2 +HELM_VERSION=2.9.1 # setup root access - default login: oom/oom - comment out to restrict access too ssh key only sed -i 's/PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config diff --git a/docs/openstack-rancher.sh b/docs/openstack-rancher.sh index d51abe4d68..1f1d2e4639 100644 --- a/docs/openstack-rancher.sh +++ b/docs/openstack-rancher.sh @@ -1,9 +1,9 @@ #!/bin/bash DOCKER_VERSION=17.03 -RANCHER_VERSION=1.6.14 +RANCHER_VERSION=1.6.18 KUBECTL_VERSION=1.8.10 -HELM_VERSION=2.8.2 +HELM_VERSION=2.9.1 # setup root access - default login: oom/oom - comment out to restrict access too ssh key only sed -i 's/PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config |