Skip to content

Commit

Permalink
fix: runc and crictl installation
Browse files Browse the repository at this point in the history
Signed-off-by: ffais <ffais@fbk.eu>
  • Loading branch information
ffais committed Dec 18, 2024
1 parent ee79398 commit 753857d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
3 changes: 2 additions & 1 deletion images/capi/ansible/roles/containerd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,16 @@

- name: Copy containerd.service to /etc/systemd/system
ansible.builtin.copy:
remote_src: true
src: /tmp/containerd.service
dest: /etc/systemd/system/containerd.service
mode: "0600"
when: ansible_os_family != "Flatcar"

- name: Copy runc to /usr/local/sbin
ansible.builtin.copy:
src: /tmp/runc
remote_src: true
src: /tmp/runc
dest: /usr/local/sbin/runc
mode: "0755"
when: ansible_os_family != "Flatcar"
Expand Down
15 changes: 7 additions & 8 deletions images/capi/ansible/roles/kubernetes/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
- ansible.builtin.import_tasks: photon.yml
when: kubernetes_source_type == "pkg" and ansible_os_family == "VMware Photon OS"

- ansible.builtin.import_tasks: url.yml
when: kubernetes_source_type == "http" and kubernetes_cni_source_type == "http"

# must include crictl-url.yml after installing containerd,
# as the cri-containerd tarball also includes crictl.
- ansible.builtin.import_tasks: crictl-url.yml

- name: Symlink cri-tools
ansible.builtin.file:
src: /usr/local/bin/{{ item }}
Expand All @@ -37,14 +44,6 @@
- critest
when: ansible_os_family != "Flatcar"

- ansible.builtin.import_tasks: url.yml
when: kubernetes_source_type == "http" and kubernetes_cni_source_type == "http"

# must include crictl-url.yml after installing containerd,
# as the cri-containerd tarball also includes crictl.
- ansible.builtin.import_tasks: crictl-url.yml
when: crictl_source_type == "http"

- name: Create kubelet default config file
ansible.builtin.template:
src: etc/sysconfig/kubelet
Expand Down

0 comments on commit 753857d

Please sign in to comment.