standalone kubelets using containerd

1 files changed, 12 insertions, 14 deletions

diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml
index b6a8d997..a082e27b 100644
--- a/roles/containerd/tasks/main.yml
+++ b/roles/containerd/tasks/main.yml
@@ -1,18 +1,4 @@
 ---
-- name: install containerd config
-  when: containerd_config is defined
-  block:
-  - name: create containerd config directory
-    file:
-      name: /etc/containerd
-      state: directory
-
-  - name: install containerd config
-    copy:
-      content: "{{ containerd_config | to_toml }}\n"
-      dest: /etc/containerd/config.toml
-    notify: restart containerd
-
 - name: prepare storage volume for /var/lib/containerd
   when: containerd_storage is defined
   vars:
@@ -31,6 +17,18 @@
     state: present
     force: yes
 
+- name: fetch containerd default config
+  check_mode: no
+  command: containerd config default
+  register: containerd_config_default
+  changed_when: false
+
+- name: fetch containerd default config
+  copy:
+    content: "{{ containerd_config_default.stdout | from_toml | combine(containerd_config, recursive=True) | to_toml }}\n"
+    dest: /etc/containerd/config.toml
+  notify: restart containerd
+
 - name: disable automatic upgrades for containerd package
   when: containerd_pkg_version is defined
   dpkg_selections: