Added zfs support when using containerd config

puppetlabs · Dec 15, 2023 · b336859 · b336859
1 parent 7bebd70
commit b336859
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -73,6 +73,10 @@
 #   The default runtime to use with containerd
 #   Defaults to runc
 #
+# [*containerd_snapshotter*]
+#   The default snapshotter to use with containerd
+#   Defaults to overlayfs
+#
 # [*containerd_sandbox_image*]
 #  The configuration for the image pause container
 #  Defaults registry.k8s.io/pause:3.2
@@ -698,6 +702,7 @@
   },
   Enum['runc','nvidia'] $containerd_default_runtime_name  = 'runc',
   String $containerd_sandbox_image                        = 'registry.k8s.io/pause:3.2',
+  Enum['overlayfs', 'zfs'] $containerd_snapshotter        = 'overlayfs',
   String $etcd_archive                                    = "etcd-v${etcd_version}-linux-amd64.tar.gz",
   Optional[String] $etcd_archive_checksum                 = undef,
   String $etcd_package_name                               = 'etcd-server',

diff --git a/manifests/packages.pp b/manifests/packages.pp
@@ -139,6 +139,8 @@
   Optional[Hash] $containerd_plugins_registry           = $kubernetes::containerd_plugins_registry,
   Enum['runc','nvidia']
   $containerd_default_runtime_name                      = $kubernetes::containerd_default_runtime_name,
+  Enum['overlayfs', 'zfs']
+  $containerd_snapshotter                               = $kubernetes::containerd_snapshotter,
   String $etcd_archive                                  = $kubernetes::etcd_archive,
   Optional[String] $etcd_archive_checksum               = $kubernetes::etcd_archive_checksum,
   String $etcd_version                                  = $kubernetes::etcd_version,

diff --git a/templates/containerd/config.toml.epp b/templates/containerd/config.toml.epp
@@ -69,8 +69,8 @@ oom_score = 0
     disable_hugetlb_controller = true
     ignore_image_defined_volumes = false
     [plugins."io.containerd.grpc.v1.cri".containerd]
-      snapshotter = "overlayfs"
-      default_runtime_name = "<%= $containerd_default_runtime_name %>"
+      default_runtime_name = "<%= @containerd_default_runtime_name %>"
+      snapshotter = "<%= @containerd_snapshotter -%>"
       no_pivot = false
       disable_snapshot_annotations = true
       discard_unpacked_layers = false