Skip to content

Commit 867ac68

Browse files
r-tierneydavid22swan
authored andcommitted
make cgroup_driver default to systemd
1 parent ab8b9b2 commit 867ac68

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

REFERENCE.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ Defaults to ""
10731073

10741074
[*cgroup_driver*]
10751075
The cgroup driver to be used.
1076-
Defaults to 'systemd' on EL and 'cgroupfs' otherwise
1076+
Defaults to 'systemd'
10771077

10781078
[*environment*]
10791079
The environment passed to kubectl commands.
@@ -2290,13 +2290,8 @@ Data type: `String`
22902290

22912291

22922292

2293-
Default value:
2293+
Default value: `'systemd'`
22942294

2295-
```puppet
2296-
$facts['os']['family'] ? {
2297-
'RedHat' => 'systemd',
2298-
default => 'cgroupfs'
2299-
```
23002295

23012296
##### <a name="-kubernetes--environment"></a>`environment`
23022297

manifests/config/kubeadm.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
# Defaults to k8s.gcr.io
192192
# @param cgroup_driver
193193
# The cgroup driver to be used.
194-
# Defaults to 'systemd' on EL and 'cgroupfs' otherwise
194+
# Defaults to 'systemd'
195195
# @param proxy_mode
196196
# The mode for kubeproxy to run. It should be one of: "" (default), "userspace", "kernelspace", "iptables", or "ipvs".
197197
# Defaults to ""

manifests/config/worker.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
# Defaults to false
6262
# @param cgroup_driver
6363
# The cgroup driver to be used.
64-
# Defaults to 'systemd' on EL and 'cgroupfs' otherwise
64+
# Defaults to 'systemd'
6565
# @param skip_phases_join
6666
# Allow kubeadm join to skip some phases
6767
# Only works with Kubernetes 1.22+

manifests/init.pp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@
500500
#
501501
# [*cgroup_driver*]
502502
# The cgroup driver to be used.
503-
# Defaults to 'systemd' on EL and 'cgroupfs' otherwise
503+
# Defaults to 'systemd'
504504
#
505505
# [*environment*]
506506
# The environment passed to kubectl commands.
@@ -736,10 +736,7 @@
736736
Boolean $create_repos = true,
737737
String $image_repository = 'registry.k8s.io',
738738
Array[String] $default_path = ['/usr/bin', '/usr/sbin', '/bin', '/sbin', '/usr/local/bin'],
739-
String $cgroup_driver = $facts['os']['family'] ? {
740-
'RedHat' => 'systemd',
741-
default => 'cgroupfs',
742-
},
739+
String $cgroup_driver = 'systemd',
743740
Array[String] $environment = $controller ? {
744741
true => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
745742
default => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/kubelet.conf'],

manifests/packages.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# @param docker_storage_driver
2424
# Storage Driver to be added to `/etc/docker/daemon.json`. Defaults to overlay2
2525
# @param docker_cgroup_driver
26-
# The cgroup driver to be used. Defaults to 'systemd' on EL and 'cgroupfs' otherwise
26+
# The cgroup driver to be used. Defaults to 'systemd'
2727
# @param docker_storage_opts
2828
# Storage options to be added to `/etc/docker/daemon.json`. Defaults to undef
2929
# @param docker_extra_daemon_config

0 commit comments

Comments
 (0)