Merge pull request #282 from songjiaxun/use_helm3_in_e2e_test

test: use helm 3 in e2e test

Author: k8s-ci-robot

Makefile

@@ -62,20 +62,16 @@ e2e-test:
 e2e-bootstrap: install-helm
 	# Only build and push the image if it does not exist in the registry
 	docker pull $(IMAGE_TAG) || make blob-container push
-	helm install charts/latest/blob-csi-driver -n blob-csi-driver --namespace kube-system --wait \
+	helm install blob-csi-driver ./charts/latest/blob-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
 		$(E2E_HELM_OPTIONS)
 
 .PHONY: install-helm
 install-helm:
-	# Use v2.11.0 helm to match tiller's version in clusters made by aks-engine
-	curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | DESIRED_VERSION=v2.11.0 bash
-	# Make sure tiller is ready
-	kubectl wait pod -l name=tiller --namespace kube-system --for condition=ready --timeout 5m
-	helm version
+	curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
 .PHONY: e2e-teardown
 e2e-teardown:
-	helm delete --purge blob-csi-driver
+	helm delete blob-csi-driver --namespace kube-system
 
 .PHONY: blob
 blob:

test/e2e/README.md

@@ -3,14 +3,6 @@
 ## Run E2E tests Locally
 ### Prerequisite
  - Make sure a kubernetes cluster(with version >= 1.13) is set up and kubeconfig is under `$HOME/.kube/config`. Make sure kubectl is functional.
- - Better to do: install Helm and Tiller 
- ```
-# Use v2.11.0 helm to match tiller's version in clusters made by aks-engine
-curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | DESIRED_VERSION=v2.11.0 bash
-
-# Install Tiller for Helm version v2.11.0
-helm init --history-max 200 --override spec.selector.matchLabels.'name'='tiller',spec.selector.matchLabels.'app'='helm' --output yaml | sed 's@apiVersion: extensions/v1beta1@apiVersion: apps/v1@' | kubectl apply -f -
-```
  - Set Azure credentials by environment variables
  > You could get these variables from `/etc/kubernetes/azure.json` on a kubernetes cluster node
 ```