Skip to content

Commit

Permalink
Use latest helm v3 version, and remove install_tiller function
Browse files Browse the repository at this point in the history
Signed-off-by: Scott Rigby <[email protected]>
  • Loading branch information
scottrigby committed Nov 2, 2019
1 parent cf08767 commit 63dedab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
machine:
enabled: true
image: circleci/classic:201808-01
environment:
HELM_VERSION: v3.0.0-rc.2
steps:
- checkout
- run:
Expand All @@ -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
Expand Down
9 changes: 0 additions & 9 deletions e2e-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -57,7 +49,6 @@ main() {

create_kind_cluster
install_local-path-provisioner
install_tiller
test_e2e
}

Expand Down

0 comments on commit 63dedab

Please sign in to comment.