From e7723d81ce755e432fb9e7457b58abc68803cf91 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Wed, 13 Sep 2017 17:43:46 -0600
Subject: [PATCH] Helm: move to helm v2.6.1

This ps bumps the Helm version to v2.6.1.

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

diff --git a/doc/source/install/developer/all-in-one.rst b/doc/source/install/developer/all-in-one.rst
index 62a802f067..e6acc3fa00 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.7.5
-      export HELM_VERSION=v2.5.1
+      export HELM_VERSION=v2.6.1
       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 830b58de1a..3ca1284558 100644
--- a/doc/source/install/multinode.rst
+++ b/doc/source/install/multinode.rst
@@ -32,7 +32,7 @@ comments, please create an `issue
        - `v1.7.5 <https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v175>`_
        - `Custom Controller for RDB tools <https://quay.io/repository/attcomdev/kube-controller-manager?tab=tags>`_
      * - **Helm**
-       - `v2.5.1 <https://github.com/kubernetes/helm/releases/tag/v2.5.1>`_
+       - `v2.6.1 <https://github.com/kubernetes/helm/releases/tag/v2.6.1>`_
        -
      * - **Calico**
        - `v2.1 <http://docs.projectcalico.org/v2.1/releases/>`_
diff --git a/tools/gate/vars.sh b/tools/gate/vars.sh
index 62409a26e7..bf144e6947 100755
--- a/tools/gate/vars.sh
+++ b/tools/gate/vars.sh
@@ -23,7 +23,7 @@ source /etc/os-release
 export HOST_OS=${HOST_OS:="${ID}"}
 
 # Set versions of K8s and Helm to use
-export HELM_VERSION=${HELM_VERSION:-"v2.5.1"}
+export HELM_VERSION=${HELM_VERSION:-"v2.6.1"}
 export KUBE_VERSION=${KUBE_VERSION:-"v1.7.5"}
 
 # Set K8s-AIO options
diff --git a/tools/kubeadm-aio/Dockerfile b/tools/kubeadm-aio/Dockerfile
index 037231d6d7..105e98f0e2 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.5.1 \
+ENV HELM_VERSION=v2.6.1 \
     KUBE_VERSION=v1.7.5 \
     CNI_VERSION=v0.6.0-rc2 \
     container="docker" \