0.14.0+2.0.2 (#35)

* vars/flavor_base.yml: add containerd-stress binary

* update README/CHANGELOG

* adjust containerd_config variable to meet configuration changes of version 3

* templates/etc/systemd/system/containerd.service.j2: add dbus.service to After=

* update years

* fix typos

* vars/flavor_base.yml: update list of containerd binaries

* update README/CHANGELOG

* Molecule: adjust expected output of ctr pull command

* update README/CHANGELOG

Author: githubixx

.gitignore

@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 molecule/kvm/.vagrant

.yamllint

@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 extends: default

CHANGELOG.md

@@ -1,10 +1,25 @@
 <!--
-Copyright (C) 2021-2024 Robert Wimmer
+Copyright (C) 2021-2025 Robert Wimmer
 SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
 # Changelog
 
+**Note**: This a major release update to `containerd` version `2.0.2`! Please read the [changelog of containerd v2.0.2](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) accordingly! In general if you haven't used any "exotic" features so far this version of the Ansible role should cover everything already and upgrading should be smooth. Nevertheless you should test the changes before!
+
+## 0.14.0+2.0.2
+
+- **POTENTIALLY BREAKING**
+  - `containerd_config` variable value was adjusted to to meet `containerd` configuration requirements of version `3`. Please see [Full configuration](https://github.com/containerd/containerd/blob/main/docs/cri/config.md#full-configuration) for all possible values. If you haven't adjusted this variable then there should be no need to change anything and upgrading should be smooth.
+  - update list of containerd binaries in `containerd_binaries` variable. `containerd-shim-runc-v1` and `containerd-shim` were removed as no longer provided by upstream.
+
+- **UPDATE**
+  - update `containerd` to `v2.0.2`
+  - `templates/etc/systemd/system/containerd.service.j2`: add `dbus.service` to `After=`
+
+- **MOLECULE**
+  - adjust expected output of `ctr pull` command
+
 ## 0.13.2+1.7.22
 
 - **UPDATE**
@@ -69,7 +84,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 ## 0.11.0+1.7.8
 
-**Note** This release contains quite a few breaking changes. This mostly happened because `cri-containerd-*.tar.gz release bundles` are [deprecated](https://github.com/containerd/containerd/blob/main/RELEASES.md#deprecated-features). Also see [cri-containerd.DEPRECATED.txt](https://github.com/containerd/containerd/blob/main/releases/cri-containerd.DEPRECATED.txt). So `containerd` doesn't contain `CNI plugins` and `runc` anymore. You can still use this bundle if you use version `0.10.0+1.7.3` of this Ansible role. But for this version I deciced to remove the support already before `containerd` `v2.0` will be released. That means for `containerd_flavor` only the value `base` can be used and `k8s` has been gone. So that means you have to install [CNI - Container Network Interface](https://github.com/containernetworking/plugins) and [runc](https://github.com/opencontainers/runc) separately. This should happen before you install `containerd`. You can use my Ansible roles
+**Note** This release contains quite a few breaking changes. This mostly happened because `cri-containerd-*.tar.gz release bundles` are [deprecated](https://github.com/containerd/containerd/blob/main/RELEASES.md#deprecated-features). Also see [cri-containerd.DEPRECATED.txt](https://github.com/containerd/containerd/blob/main/releases/cri-containerd.DEPRECATED.txt). So `containerd` doesn't contain `CNI plugins` and `runc` anymore. You can still use this bundle if you use version `0.10.0+1.7.3` of this Ansible role. But for this version I decided to remove the support already before `containerd` `v2.0` will be released. That means for `containerd_flavor` only the value `base` can be used and `k8s` has been gone. So that means you have to install [CNI - Container Network Interface](https://github.com/containernetworking/plugins) and [runc](https://github.com/opencontainers/runc) separately. This should happen before you install `containerd`. You can use my Ansible roles
 
 - For CNI: [ansible-role-cni](https://github.com/githubixx/ansible-role-cni)
 - For runc: [ansible-role-runc](https://github.com/githubixx/ansible-role-runc)
@@ -164,7 +179,7 @@ Other changes:
 
 ## 0.2.0+1.5.8
 
-- add support for Kubernetes by allowing to optionally also install `runc`, `crtcl` and `CNI` plugins. `containerd` builds are available in two flavors: Either just the `containerd` binaries or `containerd` binaries plus everything else needed to use `containerd` together with Kubernetes. Please see [defaults/main.yml](https://github.com/githubixx/ansible-role-containerd/tree/master/defaults/main.yml) for all possible settings. With the Kubernetes support a lot of new variables were introduced but for almost all the default values should be good enough. The default `containerd_flavor: "base"` mimics the behavior of the previous version of this role. So upgrading shouldn't be an issue.
+- add support for Kubernetes by allowing to optionally also install `runc`, `crictl` and `CNI` plugins. `containerd` builds are available in two flavors: Either just the `containerd` binaries or `containerd` binaries plus everything else needed to use `containerd` together with Kubernetes. Please see [defaults/main.yml](https://github.com/githubixx/ansible-role-containerd/tree/master/defaults/main.yml) for all possible settings. With the Kubernetes support a lot of new variables were introduced but for almost all the default values should be good enough. The default `containerd_flavor: "base"` mimics the behavior of the previous version of this role. So upgrading shouldn't be an issue.
 
 ## 0.1.1+1.5.8
 

README.md

@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2021-2024 Robert Wimmer
+Copyright (C) 2021-2025 Robert Wimmer
 SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
@@ -15,6 +15,21 @@ See full [CHANGELOG](https://github.com/githubixx/ansible-role-containerd/blob/m
 
 **Recent changes:**
 
+## 0.14.0+2.0.2
+
+**Note**: This a major release update to `containerd` version `2.0.2`! Please read the [changelog of containerd v2.0.2](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) accordingly! In general if you haven't used any "exotic" features so far this version of the Ansible role should cover everything already and upgrading should be smooth. Nevertheless you should test the changes before!
+
+- **POTENTIALLY BREAKING**
+  - `containerd_config` variable value was adjusted to to meet `containerd` configuration requirements of version `3`. Please see [Full configuration](https://github.com/containerd/containerd/blob/main/docs/cri/config.md#full-configuration) for all possible values. If you haven't adjusted this variable then there should be no need to change anything and upgrading should be smooth.
+  - update list of containerd binaries in `containerd_binaries` variable. `containerd-shim-runc-v1` and `containerd-shim` were removed as no longer provided by upstream.
+
+- **UPDATE**
+  - update `containerd` to `v2.0.2`
+  - `templates/etc/systemd/system/containerd.service.j2`: add `dbus.service` to `After=`
+
+- **MOLECULE**
+  - adjust expected output of `ctr pull` command
+
 ## 0.13.2+1.7.22
 
 - **UPDATE**
@@ -49,7 +64,7 @@ See full [CHANGELOG](https://github.com/githubixx/ansible-role-containerd/blob/m
 roles:
   - name: githubixx.containerd
     src: https://github.com/githubixx/ansible-role-containerd.git
-    version: 0.13.2+1.7.22
+    version: 0.14.0+2.0.2
 ```
 
 ## Role Variables
@@ -59,7 +74,7 @@ roles:
 containerd_flavor: "base"
 
 # containerd version to install
-containerd_version: "1.7.22"
+containerd_version: "2.0.2"
 
 # Directory where to store "containerd" binaries
 containerd_binary_directory: "/usr/local/bin"
@@ -107,43 +122,42 @@ containerd_service_settings:
   "LimitCORE": "infinity"
 
 # Content of configuration file of "containerd". The settings below are the
-# settings that are different to the default "containerd" settings.
+# settings that are either different to the default "containerd" settings or
+# stated explicitly to make important settings more visible even if they're
+# default. So these settings will override the default settings.
 #
 # The default "containerd" configuration can be generated with this command:
 #
 # containerd config default
 #
+# A full configuration example with all possible options is also available here:
+# https://github.com/containerd/containerd/blob/main/docs/cri/config.md#full-configuration
+#
+# Also if you want to adjust settings please consult the CRI Plugin Config Guide:
+# https://github.com/containerd/containerd/blob/main/docs/cri/config.md
+#
 # Difference to default configuration:
 #
-# - The configuration file contains a few role variables that will be replaced when
-#   the configuration template is processed.
 # - In 'plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options' the
 #   setting "SystemdCgroup" is set to "true" instead of "false". This is relevant for
 #   Kubernetes e.g. Also see:
 #   https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd-systemd)
 #
 containerd_config: |
-  version = 2
+  version = 3
   [plugins]
-    [plugins."io.containerd.grpc.v1.cri"]
-      sandbox_image = "registry.k8s.io/pause:3.8"
-      [plugins."io.containerd.grpc.v1.cri".cni]
-        bin_dir = "/opt/cni/bin"
-        conf_dir = "/etc/cni/net.d"
-      [plugins."io.containerd.grpc.v1.cri".containerd]
-        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
-          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-            runtime_type = "io.containerd.runc.v2"
-            [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
-              BinaryName = "/usr/local/sbin/runc"
+    [plugins.'io.containerd.cri.v1.runtime']
+      [plugins.'io.containerd.cri.v1.runtime'.containerd]
+        default_runtime_name = 'runc'
+        [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes]
+          [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc]
+            runtime_type = 'io.containerd.runc.v2'
+            [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc.options]
+              BinaryName = '/usr/local/sbin/runc'
               SystemdCgroup = true
-  [stream_processors]
-    [stream_processors."io.containerd.ocicrypt.decoder.v1.tar"]
-      args = ["--decryption-keys-path", "{{ containerd_config_directory }}/ocicrypt/keys"]
-      env = ["OCICRYPT_KEYPROVIDER_CONFIG={{ containerd_config_directory }}/ocicrypt/ocicrypt_keyprovider.conf"]
-    [stream_processors."io.containerd.ocicrypt.decoder.v1.tar.gzip"]
-      args = ["--decryption-keys-path", "{{ containerd_config_directory }}/ocicrypt/keys"]
-      env = ["OCICRYPT_KEYPROVIDER_CONFIG={{ containerd_config_directory }}/ocicrypt/ocicrypt_keyprovider.conf"]
+      [plugins.'io.containerd.cri.v1.runtime'.cni]
+        bin_dir = '/opt/cni/bin'
+        conf_dir = '/etc/cni/net.d'
 ```
 
 ## Dependencies

defaults/main.yml

@@ -1,12 +1,12 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Only value "base" is currently supported
 containerd_flavor: "base"
 
 # containerd version to install
-containerd_version: "1.7.22"
+containerd_version: "2.0.2"
 
 # Directory where to store "containerd" binaries
 containerd_binary_directory: "/usr/local/bin"
@@ -54,41 +54,39 @@ containerd_service_settings:
   "LimitCORE": "infinity"
 
 # Content of configuration file of "containerd". The settings below are the
-# settings that are different to the default "containerd" settings. So these
-# seetings will override the default settings.
+# settings that are either different to the default "containerd" settings or
+# stated explicitly to make important settings more visible even if they're
+# default. So these settings will override the default settings.
 #
 # The default "containerd" configuration can be generated with this command:
 #
 # containerd config default
 #
+# A full configuration example with all possible options is also available here:
+# https://github.com/containerd/containerd/blob/main/docs/cri/config.md#full-configuration
+#
+# Also if you want to adjust settings please consult the CRI Plugin Config Guide:
+# https://github.com/containerd/containerd/blob/main/docs/cri/config.md
+#
 # Difference to default configuration:
 #
-# - The configuration file contains a few role variables that will be replaced when
-#   the configuration template is processed.
 # - In 'plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options' the
 #   setting "SystemdCgroup" is set to "true" instead of "false". This is relevant for
 #   Kubernetes e.g. Also see:
 #   https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd-systemd)
 #
 containerd_config: |
-  version = 2
+  version = 3
   [plugins]
-    [plugins."io.containerd.grpc.v1.cri"]
-      sandbox_image = "registry.k8s.io/pause:3.8"
-      [plugins."io.containerd.grpc.v1.cri".cni]
-        bin_dir = "/opt/cni/bin"
-        conf_dir = "/etc/cni/net.d"
-      [plugins."io.containerd.grpc.v1.cri".containerd]
-        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
-          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-            runtime_type = "io.containerd.runc.v2"
-            [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
-              BinaryName = "/usr/local/sbin/runc"
+    [plugins.'io.containerd.cri.v1.runtime']
+      [plugins.'io.containerd.cri.v1.runtime'.containerd]
+        default_runtime_name = 'runc'
+        [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes]
+          [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc]
+            runtime_type = 'io.containerd.runc.v2'
+            [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc.options]
+              BinaryName = '/usr/local/sbin/runc'
               SystemdCgroup = true
-  [stream_processors]
-    [stream_processors."io.containerd.ocicrypt.decoder.v1.tar"]
-      args = ["--decryption-keys-path", "{{ containerd_config_directory }}/ocicrypt/keys"]
-      env = ["OCICRYPT_KEYPROVIDER_CONFIG={{ containerd_config_directory }}/ocicrypt/ocicrypt_keyprovider.conf"]
-    [stream_processors."io.containerd.ocicrypt.decoder.v1.tar.gzip"]
-      args = ["--decryption-keys-path", "{{ containerd_config_directory }}/ocicrypt/keys"]
-      env = ["OCICRYPT_KEYPROVIDER_CONFIG={{ containerd_config_directory }}/ocicrypt/ocicrypt_keyprovider.conf"]
+      [plugins.'io.containerd.cri.v1.runtime'.cni]
+        bin_dir = '/opt/cni/bin'
+        conf_dir = '/etc/cni/net.d'

handlers/main.yml

@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - name: Reload systemd

meta/main.yml

@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 galaxy_info:

molecule/default/converge.yml

@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - name: Install containerd

molecule/default/molecule.yml

@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependency:

molecule/default/prepare.yml

@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2021-2024 Robert Wimmer
+# Copyright (C) 2021-2025 Robert Wimmer
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - name: Run tasks for Archlinux