Merge "Helm: move to helm v2.6.1"

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

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/>`_

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

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" \