Skip to content

Commit 80a63fd

Browse files
committed
Move CI to use helm3
Helm 3 removes the need for tiller. This makes the installation faster and use less bandwidth. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent c2167cb commit 80a63fd

File tree

6 files changed

+14
-24
lines changed

6 files changed

+14
-24
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go:
66
- 1.13.x
77

88
install:
9-
- curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
9+
- curl -sSLf https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
1010
- helm version -c
1111
- helm init --client-only
1212

@@ -23,7 +23,6 @@ script:
2323
- ./contrib/lint_chart.sh
2424
- ./contrib/get_kind.sh
2525
- ./contrib/create_kind_cluster.sh
26-
- ./contrib/install_tiller.sh
2726
- ./contrib/deploy.sh
2827
- ./contrib/get_faas.sh
2928
- ./contrib/run_function.sh

contrib/create_dev.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
# Creates an installation of OpenFaaS in kind for development
44

55
contrib/create_kind_cluster.sh
6-
contrib/install_tiller.sh
76
contrib/deploy.sh
87
contrib/run_function.sh

contrib/deploy.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ kubectl -n openfaas create secret generic basic-auth \
2525

2626
echo "Waiting for helm install to complete."
2727

28-
helm install ./chart/openfaas \
29-
--name openfaas \
28+
helm upgrade \
29+
--install \
30+
openfaas \
31+
./chart/openfaas \
3032
--namespace openfaas \
3133
--set basic_auth=true \
3234
--set functionNamespace=openfaas-fn \

contrib/get_faas.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#!/bin/bash
22

3-
curl -sL https://cli.openfaas.com | sudo sh
3+
set -e
4+
5+
curl -sSLf https://cli.openfaas.com | sudo sh

contrib/install_tiller.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

install.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ kubectl -n openfaas create secret generic basic-auth \
1212
--from-literal=basic-auth-user=admin \
1313
--from-literal=basic-auth-password="$PASSWORD"
1414

15-
helm upgrade openfaas --install openfaas/openfaas \
15+
helm upgrade \
16+
--install \
17+
openfaas \
18+
./chart/openfaas \
1619
--namespace openfaas \
1720
--set basic_auth=true \
1821
--set functionNamespace=openfaas-fn \
19-
--set serviceType=LoadBalancer
20-
22+
--set serviceType=LoadBalancer \
23+
--wait

0 commit comments

Comments
 (0)