Merge "helm 2.9.1 from 2.8.2"

7 files changed, 15 insertions, 14 deletions

diff --git a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml
index 8f5716fead..ae57009186 100644
--- a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml
+++ b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml
@@ -47,7 +47,7 @@ inputs:
 
   helm_version:
     description: helm version to be installed
-    default: v2.8.2
+    default: v2.9.1
 
 dsl_definitions:
 
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..ad1f89e6a9 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::
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
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 928399dfb0..bdc201dab8 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -21,4 +21,4 @@ home: https://www.onap.org/
 sources:
 - https://gerrit.onap.org/r/#/admin/projects/
 icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
-tillerVersion: "~2.8.2"
+tillerVersion: "~2.9.1"