epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

added "Flatcar", "Flatcar Container Linux by Kinvolk" for all coreOS role (#5607)

Browse Source
This commit is contained in:
Sylvain Chateau
2020-02-18 09:15:29 +01:00
committed by GitHub
parent d0d9967457
commit 0ca7aa126b
32 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,8 +35,8 @@
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
- name: Helm | Copy socat wrapper for Container Linux
- name: Helm | Copy socat wrapper for Container Linux and Flatcat
command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/opt/bin {{ install_socat_image_repo }}:{{ install_socat_image_tag }}"
args:
creates: "{{ bin_dir }}/socat"
when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS']
when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS', 'Flatcar', 'Flatcar Container Linux by Kinvolk']

2
roles/kubernetes-apps/helm/tasks/main.yml
View File

@@ -113,4 +113,4 @@
shell: "umask 022 && {{ bin_dir }}/helm completion bash >/etc/bash_completion.d/helm.sh"
when:
- ((helm_container is defined and helm_container.changed) or (helm_task_result is defined and helm_task_result.changed))
- not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]