From 59fc17f4e3b84701027394e64645560a62290f68 Mon Sep 17 00:00:00 2001
From: Fatih Sarhan <f9n@protonmail.com>
Date: Wed, 19 May 2021 18:24:53 +0300
Subject: [PATCH] Override the default value of containerd's root, state, and
oom_score (#7622)
* Override the default value of containerd's root, state, and oom_score configurations
* Add tests data for containerd_storage_dir, containerd_state_dir and containerd_oom_score variables
---
inventory/sample/group_vars/all/containerd.yml | 4 ++++
roles/container-engine/containerd/defaults/main.yml | 3 +++
roles/container-engine/containerd/templates/config.toml.j2 | 3 +++
tests/files/packet_centos7-flannel-containerd-addons-ha.yml | 5 +++++
4 files changed, 15 insertions(+)
diff --git a/inventory/sample/group_vars/all/containerd.yml b/inventory/sample/group_vars/all/containerd.yml
index 795bd4aaf..82c4953db 100644
--- a/inventory/sample/group_vars/all/containerd.yml
+++ b/inventory/sample/group_vars/all/containerd.yml
@@ -1,6 +1,10 @@
---
# Please see roles/container-engine/containerd/defaults/main.yml for more configuration options
+# containerd_storage_dir: "/var/lib/containerd"
+# containerd_state_dir: "/run/containerd"
+# containerd_oom_score: 0
+
# containerd_default_runtime: "runc"
# containerd_snapshotter: "native"
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index 82276b9bf..dc9777fc0 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -1,4 +1,7 @@
---
+containerd_storage_dir: "/var/lib/containerd"
+containerd_state_dir: "/run/containerd"
+containerd_oom_score: 0
containerd_default_runtime: "runc"
# containerd_snapshotter: "native"
diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2
index c830e7a46..8fca56814 100644
--- a/roles/container-engine/containerd/templates/config.toml.j2
+++ b/roles/container-engine/containerd/templates/config.toml.j2
@@ -1,4 +1,7 @@
version = 2
+root = "{{ containerd_storage_dir }}"
+state = "{{ containerd_state_dir }}"
+oom_score = {{ containerd_oom_score }}
[grpc]
max_recv_message_size = {{ containerd_grpc_max_recv_message_size | default(16777216) }}
diff --git a/tests/files/packet_centos7-flannel-containerd-addons-ha.yml b/tests/files/packet_centos7-flannel-containerd-addons-ha.yml
index 2657cf5d1..d47ef416f 100644
--- a/tests/files/packet_centos7-flannel-containerd-addons-ha.yml
+++ b/tests/files/packet_centos7-flannel-containerd-addons-ha.yml
@@ -39,3 +39,8 @@ tls_cipher_suites:
etcd_tls_cipher_suites:
- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+
+# Containerd
+containerd_storage_dir: /var/data/containerd
+containerd_state_dir: /run/cri/containerd
+containerd_oom_score: -999
--
GitLab