Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable crun support on CRI-O #6864

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions roles/container-engine/cri-o/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ kata_runtimes:
type: oci
root: /run/kata-containers

# crun is a fast and low-memory footprint OCI Container Runtime fully written in C.
crun_runtime:
name: crun
path: /usr/bin/crun
type: oci
root: /run/crun

# When this is true, CRI-O package repositories are added. Set this to false when using an
# environment with preconfigured CRI-O package repositories.
crio_add_repos: true
8 changes: 7 additions & 1 deletion roles/container-engine/cri-o/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,18 @@

- import_tasks: "crictl.yml"

- name: Build a list of crio runtimes
- name: Build a list of crio runtimes with Katacontainers runtimes
set_fact:
crio_runtimes: "{{ crio_runtimes + kata_runtimes }}"
when:
- kata_containers_enabled

- name: Build a list of crio runtimes with crun runtime
set_fact:
crio_runtimes: "{{ crio_runtimes + [crun_runtime] }}"
when:
- crun_enabled

- name: Make sure needed folders exist in the system
with_items:
- /etc/crio
Expand Down
5 changes: 5 additions & 0 deletions roles/container-engine/crun/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---

crun_version: 0.15
crun_release_url: https://github.com/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ host_architecture }}
crun_bin_dir: /usr/bin/
19 changes: 19 additions & 0 deletions roles/container-engine/crun/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---

- name: Create binary destination folder
file:
mode: '0755'
state: directory
path: "{{ crun_bin_dir }}"

- name: Check if binary exists
stat:
path: "{{ crun_bin_dir }}/crun"
register: crun_stat

- name: Download binary
get_url:
url: "{{ crun_release_url }}"
dest: "{{ crun_bin_dir }}/crun"
mode: '0755'
when: not crun_stat.stat.exists
7 changes: 7 additions & 0 deletions roles/container-engine/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ dependencies:
- container-engine
- kata-containers

- role: container-engine/crun
when:
- crun_enabled
tags:
- container-engine
- crun

- role: container-engine/cri-o
when:
- container_manager == 'crio'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
kind: RuntimeClass
apiVersion: node.k8s.io/v1beta1
metadata:
name: crun
handler: crun
19 changes: 19 additions & 0 deletions roles/kubernetes-apps/container_runtimes/crun/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---

- name: crun | Copy runtime class manifest
copy:
src: runtimeclass-crun.yml
dest: "{{ kube_config_dir }}/runtimeclass-crun.yml"
mode: preserve
when:
- inventory_hostname == groups['kube-master'][0]

- name: crun | Apply manifests
kube:
name: "runtimeclass-crun"
kubectl: "{{ bin_dir }}/kubectl"
resource: "runtimeclass"
filename: "{{ kube_config_dir }}/runtimeclass-crun.yml"
state: "latest"
when:
- inventory_hostname == groups['kube-master'][0]
7 changes: 7 additions & 0 deletions roles/kubernetes-apps/container_runtimes/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@ dependencies:
- apps
- kata-containers
- container-runtimes

- role: kubernetes-apps/container_runtimes/crun
when: crun_enabled
tags:
- apps
- crun
- container-runtimes
4 changes: 4 additions & 0 deletions roles/kubespray-defaults/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ container_manager: docker
# When enabled, it requires `container_manager` different than Docker
kata_containers_enabled: false

# Enable crun as additional container runtime
# When enabled, it requires container_manager=crio
crun_enabled: false

# Container on localhost (download images when download_localhost is true)
container_manager_on_localhost: "{{ container_manager }}"

Expand Down