From a0225507a07491804bdeffeac00978f32181a683 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Wed, 29 Nov 2017 19:52:54 +0000
Subject: [PATCH] Set helm deployment type to host (#2012)

---
 inventory/group_vars/k8s-cluster.yml              | 2 +-
 roles/kubernetes-apps/helm/defaults/main.yml      | 2 +-
 roles/kubernetes-apps/helm/tasks/install_host.yml | 4 ++--
 roles/kubespray-defaults/defaults/main.yaml       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inventory/group_vars/k8s-cluster.yml b/inventory/group_vars/k8s-cluster.yml
index a65318658..034b86488 100644
--- a/inventory/group_vars/k8s-cluster.yml
+++ b/inventory/group_vars/k8s-cluster.yml
@@ -138,7 +138,7 @@ docker_bin_dir: "/usr/bin"
 etcd_deployment_type: docker
 kubelet_deployment_type: host
 vault_deployment_type: docker
-helm_deployment_type: docker
+helm_deployment_type: host
 
 # K8s image pull policy (imagePullPolicy)
 k8s_image_pull_policy: IfNotPresent
diff --git a/roles/kubernetes-apps/helm/defaults/main.yml b/roles/kubernetes-apps/helm/defaults/main.yml
index ebaa545a4..0bc22739c 100644
--- a/roles/kubernetes-apps/helm/defaults/main.yml
+++ b/roles/kubernetes-apps/helm/defaults/main.yml
@@ -5,7 +5,7 @@ helm_enabled: false
 helm_home_dir: "/root/.helm"
 
 # Deployment mode: host or docker
-helm_deployment_type: docker
+helm_deployment_type: host
 
 # Do not download the local repository cache on helm init
 helm_skip_refresh: false
diff --git a/roles/kubernetes-apps/helm/tasks/install_host.yml b/roles/kubernetes-apps/helm/tasks/install_host.yml
index f7552ab97..13c376a8c 100644
--- a/roles/kubernetes-apps/helm/tasks/install_host.yml
+++ b/roles/kubernetes-apps/helm/tasks/install_host.yml
@@ -1,6 +1,6 @@
 ---
 - name: Helm | Compare host helm with hyperkube container
-  command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/systembindir {{ helm_image_repo }}:{{ helm_image_tag }} /usr/bin/cmp /usr/local/bin/helm /systembindir/helm"
+  command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/systembindir --entrypoint /usr/bin/cmp {{ helm_image_repo }}:{{ helm_image_tag }} /usr/local/bin/helm /systembindir/helm"
   register: helm_task_compare_result
   until: helm_task_compare_result.rc in [0,1,2]
   retries: 4
@@ -9,7 +9,7 @@
   failed_when: "helm_task_compare_result.rc not in [0,1,2]"
 
 - name: Helm | Copy helm from helm container
-  command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/systembindir {{ helm_image_repo }}:{{ helm_image_tag }} /bin/cp -f /usr/local/bin/helm /systembindir/helm"
+  command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/systembindir --entrypoint /bin/cp {{ helm_image_repo }}:{{ helm_image_tag }} -f /usr/local/bin/helm /systembindir/helm"
   when: helm_task_compare_result.rc != 0
   register: helm_task_result
   until: helm_task_result.rc == 0
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 3ba0e67f7..5e8fecd4a 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -124,7 +124,7 @@ etcd_deployment_type: docker
 kubelet_deployment_type: docker
 cert_management: script
 vault_deployment_type: docker
-helm_deployment_type: docker
+helm_deployment_type: host
 
 # Enable kubeadm deployment (experimental)
 kubeadm_enabled: false