Add containerd on Flatcar Container Linux (#7681)
This commit is contained in:
parent
0ef7af76bc
commit
f21a707e99
2 changed files with 4 additions and 5 deletions
|
@ -11,12 +11,11 @@
|
|||
set_fact:
|
||||
is_ostree: "{{ ostree.stat.exists }}"
|
||||
|
||||
|
||||
- name: Fail containerd setup if distribution is not supported
|
||||
fail:
|
||||
msg: "{{ ansible_distribution }} is not supported by containerd."
|
||||
when:
|
||||
- not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Amazon"]
|
||||
- not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Amazon", "Flatcar Container Linux by Kinvolk"]
|
||||
|
||||
- name: gather os specific variables
|
||||
include_vars: "{{ item }}"
|
||||
|
@ -54,7 +53,7 @@
|
|||
- not is_ostree
|
||||
|
||||
- include_tasks: containerd_repo.yml
|
||||
when: not is_ostree
|
||||
when: not (is_ostree or (ansible_distribution == "Flatcar Container Linux by Kinvolk"))
|
||||
|
||||
- name: Create containerd service systemd directory if it doesn't exist
|
||||
file:
|
||||
|
@ -117,7 +116,7 @@
|
|||
delay: "{{ retry_stagger | d(3) }}"
|
||||
notify: restart containerd
|
||||
when:
|
||||
- not is_ostree
|
||||
- not (is_ostree or (ansible_distribution == "Flatcar Container Linux by Kinvolk"))
|
||||
- containerd_package_info.pkgs|length > 0
|
||||
|
||||
- include_role: # noqa unnamed-task
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
- container_manager == "docker"
|
||||
|
||||
- name: install | Copy socat wrapper for Container Linux with Containerd
|
||||
command: "{{ containerd_bin_dir }}/ctr run --rm --mount type=bind,src={{ bin_dir }},dst=/opt/bin,options=rbind:rw {{ install_socat_image_repo }}:{{ install_socat_image_tag }}"
|
||||
command: "{{ containerd_bin_dir }}/ctr --namespace k8s.io run --rm --mount type=bind,src={{ bin_dir }},dst=/opt/bin,options=rbind:rw {{ install_socat_image_repo }}:{{ install_socat_image_tag }} copysocat"
|
||||
args:
|
||||
creates: "{{ bin_dir }}/socat"
|
||||
when:
|
||||
|
|
Loading…
Reference in a new issue