From 9bb603ed0cf34aefc99faa52638526ab56e32375 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Wed, 23 Jan 2019 13:07:26 -0600
Subject: [PATCH] Update Helm to version 2.12.1

This updates Helm from version 2.11.0 to 2.12.1

Change-Id: I9bc37c330b068388df9840eb84dfb12e2536c173
---
 roles/build-helm-packages/defaults/main.yml | 2 +-
 roles/build-images/defaults/main.yml        | 2 +-
 tiller/values.yaml                          | 2 +-
 tools/deployment/common/005-deploy-k8s.sh   | 2 +-
 tools/images/kubeadm-aio/Dockerfile         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/build-helm-packages/defaults/main.yml b/roles/build-helm-packages/defaults/main.yml
index 7456bebe2..f00dd7371 100644
--- a/roles/build-helm-packages/defaults/main.yml
+++ b/roles/build-helm-packages/defaults/main.yml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 version:
-  helm: v2.11.0
+  helm: v2.12.1
 url:
   google_helm_repo: https://storage.googleapis.com/kubernetes-helm
diff --git a/roles/build-images/defaults/main.yml b/roles/build-images/defaults/main.yml
index 1dd541c98..fddf0ff84 100644
--- a/roles/build-images/defaults/main.yml
+++ b/roles/build-images/defaults/main.yml
@@ -14,7 +14,7 @@
 
 version:
   kubernetes: v1.10.9
-  helm: v2.11.0
+  helm: v2.12.1
   cni: v0.6.0
 
 proxy:
diff --git a/tiller/values.yaml b/tiller/values.yaml
index 23336915a..1868a5203 100644
--- a/tiller/values.yaml
+++ b/tiller/values.yaml
@@ -26,7 +26,7 @@ release_group: null
 
 images:
   tags:
-    tiller: gcr.io/kubernetes-helm/tiller:v2.11.0
+    tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh
index 19883fb8e..fb08aa6a7 100755
--- a/tools/deployment/common/005-deploy-k8s.sh
+++ b/tools/deployment/common/005-deploy-k8s.sh
@@ -15,7 +15,7 @@
 #    under the License.
 
 set -xe
-: ${HELM_VERSION:="v2.11.0"}
+: ${HELM_VERSION:="v2.12.1"}
 : ${KUBE_VERSION:="v1.12.2"}
 : ${MINIKUBE_VERSION:="v0.30.0"}
 : ${CALICO_VERSION:="v3.3"}
diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile
index 2e3c498e4..08a5a0a78 100644
--- a/tools/images/kubeadm-aio/Dockerfile
+++ b/tools/images/kubeadm-aio/Dockerfile
@@ -43,7 +43,7 @@ ENV CNI_VERSION ${CNI_VERSION}
 ARG CNI_REPO_URL=https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION
 ENV CNI_REPO_URL ${CNI_REPO_URL}
 
-ARG HELM_VERSION="v2.11.0"
+ARG HELM_VERSION="v2.12.1"
 ENV HELM_VERSION ${HELM_VERSION}
 
 ARG CHARTS="calico,flannel,tiller,kube-dns,kubernetes-keystone-webhook"