Skip to content

Added zfs support for conatinerd_snapshotter #667

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added zfs support for conatinerd_snapshotter #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f764256
Added zfs support when using containerd config
Mar 21, 2023
4771936
added required doc in manifests/package.pp
ashish1099 Dec 21, 2023
3edf8b6
added missing containerd_snapshotter option
ashish1099 Jan 19, 2024
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
5 changes: 5 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions manifests/packages.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@
# no_proxy values. Defaults to false
# @param containerd_socket
# The path to containerd GRPC socket. Defaults to /run/containerd/containerd.sock
# @param containerd_snapshotter
# Configure whcih containerd snapshotter to user. Can be overlayfs or zfs. Defaults to overlayfs
#
class kubernetes::packages (
String $kubernetes_package_version = $kubernetes::kubernetes_package_version,
Expand Down Expand Up @@ -139,6 +141,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,
Expand Down Expand Up @@ -356,6 +360,7 @@
'containerd_sandbox_image' => $containerd_sandbox_image,
'docker_cgroup_driver' => $docker_cgroup_driver,
'containerd_default_runtime_name' => $containerd_default_runtime_name,
'containerd_snapshotter' => $containerd_snapshotter,
})
}
# Generate using 'containerd config default'
Expand Down
2 changes: 1 addition & 1 deletion templates/containerd/config.toml.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>"
snapshotter = "<%= $containerd_snapshotter -%>"
no_pivot = false
disable_snapshot_annotations = true
discard_unpacked_layers = false
Expand Down