Skip to content

Commit

Permalink
Use the version of helm downloaded
Browse files Browse the repository at this point in the history
This fixes an issue where the user-copy of helm was used instead
of the downloaded version to install tiller and failed on
K8s 1.16.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
alexellis committed Nov 3, 2019
1 parent f978df8 commit a01f394
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/cmd/tiller_app.go
Expand Up @@ -55,6 +55,7 @@ func makeInstallTiller() *cobra.Command {
if err != nil {
return err
}

fmt.Println(task.Stdout, task.Stderr)

task, err = kubectlTask("create", "clusterrolebinding", "tiller", "--clusterrole", "cluster-admin", "--serviceaccount=kube-system:tiller")
Expand All @@ -63,8 +64,9 @@ func makeInstallTiller() *cobra.Command {
}
fmt.Println(task.Stdout, task.Stderr)

k3supBin := path.Join(userPath, ".bin")
helmInit := execute.ExecTask{
Command: "helm",
Command: path.Join(k3supBin, "helm"),
Args: []string{
"init",
"--skip-refresh", "--upgrade", "--service-account", "tiller",
Expand Down

0 comments on commit a01f394

Please sign in to comment.