From 0c36b4354de12476bdada6c9e5f08dfa968c3740 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 6 Jul 2017 12:45:34 -0500
Subject: [PATCH] Helm: Move to Helm v2.5.0

This PS Moves OpenStack-Helm to Helm version 2.5.0.

Change-Id: I79da76875a44a5fb7ff55f8c9a9d114ca5f9c186
---
 doc/source/install/developer/all-in-one.rst | 2 +-
 doc/source/install/multinode.rst            | 2 +-
 tools/gate/setup_gate.sh                    | 2 +-
 tools/kubeadm-aio/Dockerfile                | 2 +-
 tools/kubeadm-aio/README.rst                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/source/install/developer/all-in-one.rst b/doc/source/install/developer/all-in-one.rst
index 6968dc164b..43083a9dad 100644
--- a/doc/source/install/developer/all-in-one.rst
+++ b/doc/source/install/developer/all-in-one.rst
@@ -70,7 +70,7 @@ against your Kubernetes cluster.
 ::
 
       export KUBE_VERSION=v1.6.5
-      export HELM_VERSION=v2.4.1
+      export HELM_VERSION=v2.5.0
       export TMP_DIR=$(mktemp -d)
 
       curl -sSL https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl -o ${TMP_DIR}/kubectl
diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst
index 7724823291..c3b5de5f1c 100644
--- a/doc/source/install/multinode.rst
+++ b/doc/source/install/multinode.rst
@@ -32,7 +32,7 @@ comments, please create an `issue
        - `v1.6.5 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v165>`_
        - `Custom Controller for RDB tools <https://quay.io/repository/attcomdev/kube-controller-manager?tab=tags>`_
      * - **Helm**
-       - `v2.4.1 <https://github.com/kubernetes/helm/releases/tag/v2.4.1>`_
+       - `v2.5.0 <https://github.com/kubernetes/helm/releases/tag/v2.5.0>`_
        -
      * - **Calico**
        - `v2.1 <http://docs.projectcalico.org/v2.1/releases/>`_
diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh
index b732f8dad2..5463511ad2 100755
--- a/tools/gate/setup_gate.sh
+++ b/tools/gate/setup_gate.sh
@@ -13,7 +13,7 @@
 # limitations under the License.
 set -ex
 
-export HELM_VERSION=${2:-v2.4.1}
+export HELM_VERSION=${2:-v2.5.0}
 export KUBE_VERSION=${3:-v1.6.5}
 export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
 export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:${KUBE_VERSION}-ceph
diff --git a/tools/kubeadm-aio/Dockerfile b/tools/kubeadm-aio/Dockerfile
index 350fd48a1e..127ee611bb 100644
--- a/tools/kubeadm-aio/Dockerfile
+++ b/tools/kubeadm-aio/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 MAINTAINER pete.birley@att.com
 
-ENV HELM_VERSION=v2.4.1 \
+ENV HELM_VERSION=v2.5.0 \
     KUBE_VERSION=v1.6.5 \
     CNI_VERSION=v0.5.2 \
     container="docker" \
diff --git a/tools/kubeadm-aio/README.rst b/tools/kubeadm-aio/README.rst
index 631c208490..e98061a0b7 100644
--- a/tools/kubeadm-aio/README.rst
+++ b/tools/kubeadm-aio/README.rst
@@ -32,7 +32,7 @@ You should install the ``kubectl`` and ``helm`` binaries:
 .. code:: bash
 
     KUBE_VERSION=v1.6.5
-    HELM_VERSION=v2.4.1
+    HELM_VERSION=v2.5.0
 
     TMP_DIR=$(mktemp -d)
     curl -sSL https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl -o ${TMP_DIR}/kubectl