C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set helm deployment type to host (#2012)

Browse source
This commit is contained in:
Matthew Mosesohn 2017-11-29 19:52:54 +00:00 committed by GitHub
parent d39a88d63f
commit a0225507a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/k8s-cluster.yml
View file

@ -138,7 +138,7 @@ docker_bin_dir: "/usr/bin"
etcd_deployment_type: docker etcd_deployment_type: docker
kubelet_deployment_type: host kubelet_deployment_type: host
vault_deployment_type: docker vault_deployment_type: docker
helm_deployment_type: docker helm_deployment_type: host
# K8s image pull policy (imagePullPolicy) # K8s image pull policy (imagePullPolicy)
k8s_image_pull_policy: IfNotPresent k8s_image_pull_policy: IfNotPresent

2
roles/kubernetes-apps/helm/defaults/main.yml
View file

@ -5,7 +5,7 @@ helm_enabled: false
helm_home_dir: "/root/.helm" helm_home_dir: "/root/.helm"
# Deployment mode: host or docker # Deployment mode: host or docker
helm_deployment_type: docker helm_deployment_type: host
# Do not download the local repository cache on helm init # Do not download the local repository cache on helm init
helm_skip_refresh: false helm_skip_refresh: false

4
roles/kubernetes-apps/helm/tasks/install_host.yml
View file

@ -1,6 +1,6 @@
--- ---
- name: Helm | Compare host helm with hyperkube container - 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 register: helm_task_compare_result
until: helm_task_compare_result.rc in [0,1,2] until: helm_task_compare_result.rc in [0,1,2]
retries: 4 retries: 4
@ -9,7 +9,7 @@
failed_when: "helm_task_compare_result.rc not in [0,1,2]" failed_when: "helm_task_compare_result.rc not in [0,1,2]"
- name: Helm | Copy helm from helm container - 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 when: helm_task_compare_result.rc != 0
register: helm_task_result register: helm_task_result
until: helm_task_result.rc == 0 until: helm_task_result.rc == 0

2
roles/kubespray-defaults/defaults/main.yaml
View file

@ -124,7 +124,7 @@ etcd_deployment_type: docker
kubelet_deployment_type: docker kubelet_deployment_type: docker
cert_management: script cert_management: script
vault_deployment_type: docker vault_deployment_type: docker
helm_deployment_type: docker helm_deployment_type: host
# Enable kubeadm deployment (experimental) # Enable kubeadm deployment (experimental)
kubeadm_enabled: false kubeadm_enabled: false