Skip to content

Commit beb7173

Browse files
committed
test: use helm 3+
1 parent 38a42e7 commit beb7173

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,16 @@ e2e-test:
6262
e2e-bootstrap: install-helm
6363
# Only build and push the image if it does not exist in the registry
6464
docker pull $(IMAGE_TAG) || make blob-container push
65-
helm install charts/latest/blob-csi-driver -n blob-csi-driver --namespace kube-system --wait \
65+
helm install blob-csi-driver ./charts/latest/blob-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
6666
$(E2E_HELM_OPTIONS)
6767

6868
.PHONY: install-helm
6969
install-helm:
70-
# Use v2.11.0 helm to match tiller's version in clusters made by aks-engine
71-
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | DESIRED_VERSION=v2.11.0 bash
72-
# Make sure tiller is ready
73-
kubectl wait pod -l name=tiller --namespace kube-system --for condition=ready --timeout 5m
74-
helm version
70+
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
7571

7672
.PHONY: e2e-teardown
7773
e2e-teardown:
78-
helm delete --purge blob-csi-driver
74+
helm delete blob-csi-driver --namespace kube-system
7975

8076
.PHONY: blob
8177
blob:

test/e2e/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
## Run E2E tests Locally
44
### Prerequisite
55
- Make sure a kubernetes cluster(with version >= 1.13) is set up and kubeconfig is under `$HOME/.kube/config`. Make sure kubectl is functional.
6-
- Better to do: install Helm and Tiller
7-
```
8-
# Use v2.11.0 helm to match tiller's version in clusters made by aks-engine
9-
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | DESIRED_VERSION=v2.11.0 bash
10-
11-
# Install Tiller for Helm version v2.11.0
12-
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 -
13-
```
146
- Set Azure credentials by environment variables
157
> You could get these variables from `/etc/kubernetes/azure.json` on a kubernetes cluster node
168
```

0 commit comments

Comments
 (0)