Skip to content

Commit

Permalink
Added zfs support when using containerd config
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashish Jaiswal authored and ashish1099 committed Dec 15, 2023
1 parent 7bebd70 commit f764256
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions manifests/init.pp
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
2 changes: 2 additions & 0 deletions manifests/packages.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Check warning on line 143 in manifests/packages.pp

View workflow job for this annotation

GitHub Actions / Spec / Spec tests (Puppet: ~> 7.24, Ruby Ver: 2.7)

missing documentation for class parameter kubernetes::packages::containerd_snapshotter (check: parameter_documentation)

Check warning on line 143 in manifests/packages.pp

View workflow job for this annotation

GitHub Actions / Spec / Spec tests (Puppet: ~> 8.0, Ruby Ver: 3.2)

missing documentation for class parameter kubernetes::packages::containerd_snapshotter (check: parameter_documentation)
String $etcd_archive = $kubernetes::etcd_archive,
Optional[String] $etcd_archive_checksum = $kubernetes::etcd_archive_checksum,
String $etcd_version = $kubernetes::etcd_version,
Expand Down
2 changes: 1 addition & 1 deletion templates/containerd/config.toml.epp
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

0 comments on commit f764256

Please sign in to comment.