Skip to content

Commit fc5b6b4

Browse files
author
Dave Try
committed
ensuring files are created before kubelet is started
1 parent 6bef8a3 commit fc5b6b4

File tree

1 file changed

+40
-36
lines changed

1 file changed

+40
-36
lines changed

manifests/service.pp

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,9 @@
1010

1111
$peeruls = inline_template("'{\"peerURLs\":[\"http://${etcd_ip}:2380\"]}'")
1212

13-
if $container_runtime == 'docker' {
14-
15-
service { 'docker':
16-
ensure => running,
17-
enable => true,
18-
}
19-
20-
service {'kubelet':
21-
ensure => running,
22-
enable => true,
23-
subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
24-
require => Service['docker'],
25-
}
26-
}
27-
2813
file {'/etc/systemd/system/kubelet.service.d':
2914
ensure => 'directory',
30-
}
15+
}
3116

3217
file {'/etc/systemd/system/kubelet.service.d/kubernetes.conf':
3318
ensure => 'file',
@@ -37,38 +22,57 @@
3722
content => template('kubernetes/kubernetes.conf.erb'),
3823
require => File['/etc/systemd/system/kubelet.service.d'],
3924
notify => Exec['Reload systemd'],
40-
}
25+
}
4126

4227
exec { 'Reload systemd':
4328
path => '/bin',
4429
command => 'systemctl daemon-reload',
4530
refreshonly => true,
31+
}
32+
33+
case $container_runtime {
34+
'docker': {
35+
service { 'docker':
36+
ensure => running,
37+
enable => true,
38+
}
39+
40+
service {'kubelet':
41+
ensure => running,
42+
enable => true,
43+
subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
44+
require => Service['docker'],
45+
}
4646
}
4747

48-
if $container_runtime == 'cri_containerd' {
48+
'cri_containerd': {
49+
service {'containerd':
50+
ensure => running,
51+
enable => true,
52+
require => Exec['Reload systemd'],
53+
before => Service['kubelet'],
54+
}
4955

50-
service {'containerd':
51-
ensure => running,
52-
enable => true,
53-
require => Exec['Reload systemd'],
54-
before => Service['kubelet'],
55-
}
56+
service {'cri-containerd':
57+
ensure => running,
58+
enable => true,
59+
require => Exec['Reload systemd'],
60+
before => Service['kubelet'],
61+
}
5662

57-
service {'cri-containerd':
58-
ensure => running,
59-
enable => true,
60-
require => Exec['Reload systemd'],
61-
before => Service['kubelet'],
62-
}
63+
service {'kubelet':
64+
ensure => running,
65+
enable => true,
66+
subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
67+
require => [Service['containerd'], Service['cri-containerd']],
68+
}
69+
}
6370

64-
service {'kubelet':
65-
ensure => running,
66-
enable => true,
67-
subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
68-
require => [Service['containerd'], Service['cri-containerd']],
71+
default: {
72+
fail("Please specify a valid container runtime")
73+
}
6974
}
7075

71-
}
7276
if $bootstrap_controller {
7377

7478
exec {'Checking for the Kubernets cluster to be ready':

0 commit comments

Comments
 (0)