From 63dedab3a2afad5be43e95cb55046145acb5a415 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Sat, 2 Nov 2019 14:55:12 -0400
Subject: [PATCH] Use latest helm v3 version, and remove install_tiller
 function

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 .circleci/config.yml | 4 +++-
 e2e-kind.sh          | 9 ---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 419e3ee9..04898f1b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,8 @@ jobs:
     machine:
       enabled: true
       image: circleci/classic:201808-01
+    environment:
+      HELM_VERSION: v3.0.0-rc.2
     steps:
       - checkout
       - run:
@@ -30,7 +32,7 @@ jobs:
             chmod +x ./kubectl
             sudo mv ./kubectl /usr/local/bin/kubectl
 
-            curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
+            curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash -s -- -v $HELM_VERSION
             curl -sSLo kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.5.1/kind-linux-amd64"
             chmod +x kind
             sudo mv kind /usr/local/bin/kind
diff --git a/e2e-kind.sh b/e2e-kind.sh
index 873d3727..bccf4b01 100755
--- a/e2e-kind.sh
+++ b/e2e-kind.sh
@@ -22,14 +22,6 @@ create_kind_cluster() {
     echo
 }
 
-install_tiller() {
-    echo 'Installing Tiller...'
-    kubectl --namespace kube-system --output yaml create serviceaccount tiller --dry-run | kubectl apply -f -
-    kubectl create --output yaml clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller --dry-run | kubectl apply -f -
-    helm init --service-account tiller --upgrade --wait
-    echo
-}
-
 install_local-path-provisioner() {
     # kind doesn't support Dynamic PVC provisioning yet, this is one way to get it working
     # https://github.com/rancher/local-path-provisioner
@@ -57,7 +49,6 @@ main() {
 
     create_kind_cluster
     install_local-path-provisioner
-    install_tiller
     test_e2e
 }