Skip to content

Commit 775a492

Browse files
author
sanfrancrisko
authored
Merge pull request #483 from daianamezdrea/fix_link
Bump containerd version to 1.5.0 and fix source link
2 parents 1d99881 + c60c413 commit 775a492

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Defaults to `false`.
251251

252252
Specifies the version of the containerd runtime the module installs.
253253

254-
Defaults to `1.1.0`.
254+
Defaults to `1.4.3`.
255255

256256
### `containerd_install_method`
257257

‎manifests/init.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
'RedHat' => $kubernetes::kubernetes_version,
515515
},
516516
String $container_runtime = 'docker',
517-
Optional[String] $containerd_version = '1.1.0',
517+
Optional[String] $containerd_version = '1.4.3',
518518
Enum['archive','package'] $containerd_install_method = 'archive',
519519
String $containerd_package_name = 'containerd.io',
520520
Optional[String] $docker_package_name = 'docker-engine',

‎spec/classes/packages_spec.rb‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
'container_runtime' => 'docker',
3636
'kubernetes_package_version' => '1.10.2',
3737
'docker_version' => '17.03.1.ce-1.el7.centos',
38-
'containerd_version' => '1.1.0',
38+
'containerd_version' => '1.5.0',
3939
'containerd_install_method' => 'archive',
4040
'containerd_package_name' => 'containerd.io',
41-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
42-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
41+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
42+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
4343
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
4444
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
4545
'runc_source' => 'https://github.com/runcsource',
@@ -124,11 +124,11 @@
124124
'container_runtime' => 'docker',
125125
'kubernetes_package_version' => '1.10.2',
126126
'docker_version' => '17.03.1.ce-1.el7.centos',
127-
'containerd_version' => '1.1.0',
127+
'containerd_version' => '1.4.3',
128128
'containerd_install_method' => 'archive',
129129
'containerd_package_name' => 'containerd.io',
130-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
131-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
130+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
131+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
132132
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
133133
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
134134
'runc_source' => 'https://github.com/runcsource',
@@ -212,11 +212,11 @@
212212
'container_runtime' => 'cri_containerd',
213213
'kubernetes_package_version' => '1.10.2',
214214
'docker_version' => '17.03.1.ce-1.el7.centos',
215-
'containerd_version' => '1.1.0',
215+
'containerd_version' => '1.4.3',
216216
'containerd_install_method' => 'package',
217217
'containerd_package_name' => 'containerd.io',
218-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
219-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
218+
'containerd_archive' =>'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
219+
'containerd_source' => 'containerd-1.4.3-linux-amd64.tar.gz',
220220
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
221221
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
222222
'runc_source' => 'https://github.com/runcsource',
@@ -249,7 +249,7 @@
249249
it { should contain_kmod__load('br_netfilter')}
250250
it { should contain_sysctl('net.bridge.bridge-nf-call-iptables').with_ensure('present').with_value('1')}
251251
it { should contain_sysctl('net.ipv4.ip_forward').with_ensure('present').with_value('1')}
252-
it { should contain_package('containerd.io').with_ensure('1.1.0')}
252+
it { should contain_package('containerd.io').with_ensure('1.4.3')}
253253
it { should contain_archive('etcd-v3.1.12-linux-amd64.tar.gz')}
254254
it { should contain_package('kubelet').with_ensure('1.10.2')}
255255
it { should contain_package('kubectl').with_ensure('1.10.2')}
@@ -289,11 +289,11 @@
289289
'container_runtime' => 'cri_containerd',
290290
'kubernetes_package_version' => '1.10.2-00',
291291
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
292-
'containerd_version' => '1.1.0',
292+
'containerd_version' => '1.4.3',
293293
'containerd_install_method' => 'archive',
294294
'containerd_package_name' => 'containerd.io',
295-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
296-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
295+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
296+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
297297
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
298298
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
299299
'runc_source' => 'https://github.com/runcsource',
@@ -328,7 +328,7 @@
328328
it { should contain_sysctl('net.ipv4.ip_forward').with_ensure('present').with_value('1')}
329329
it { should contain_archive('/usr/bin/runc')}
330330
it { should contain_file('/usr/bin/runc')}
331-
it { should contain_archive('containerd-1.1.0.linux-amd64.tar.gz')}
331+
it { should contain_archive('containerd-1.4.3-linux-amd64.tar.gz')}
332332
it { should_not contain_archive('etcd-v3.1.12-linux-amd64.tar.gz')}
333333
it { should contain_package('kubelet').with_ensure('1.10.2-00')}
334334
it { should contain_package('kubectl').with_ensure('1.10.2-00')}
@@ -377,11 +377,11 @@
377377
'container_runtime' => 'docker',
378378
'kubernetes_package_version' => '1.10.2',
379379
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
380-
'containerd_version' => '1.1.0',
380+
'containerd_version' => '1.4.3',
381381
'containerd_install_method' => 'archive',
382382
'containerd_package_name' => 'containerd.io',
383-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
384-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
383+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
384+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
385385
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
386386
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
387387
'runc_source' => 'https://github.com/runcsource',
@@ -465,11 +465,11 @@
465465
'container_runtime' => 'docker',
466466
'kubernetes_package_version' => '1.10.2',
467467
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
468-
'containerd_version' => '1.1.0',
468+
'containerd_version' => '1.4.3',
469469
'containerd_install_method' => 'archive',
470470
'containerd_package_name' => 'containerd.io',
471-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
472-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
471+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
472+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
473473
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
474474
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
475475
'runc_source' => 'https://github.com/runcsource',
@@ -549,11 +549,11 @@
549549
'container_runtime' => 'cri_containerd',
550550
'kubernetes_package_version' => '1.10.2',
551551
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
552-
'containerd_version' => '1.1.0',
552+
'containerd_version' => '1.4.3',
553553
'containerd_install_method' => 'package',
554554
'containerd_package_name' => 'containerd.io',
555-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
556-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
555+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
556+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
557557
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
558558
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
559559
'runc_source' => 'https://github.com/runcsource',
@@ -590,7 +590,7 @@
590590
it { should contain_package('kubelet').with_ensure('1.10.2')}
591591
it { should contain_package('kubectl').with_ensure('1.10.2')}
592592
it { should contain_package('kubeadm').with_ensure('1.10.2')}
593-
it { should contain_package('containerd.io').with_ensure('1.1.0')}
593+
it { should contain_package('containerd.io').with_ensure('1.4.3')}
594594
it { should contain_file('/etc/containerd')}
595595
it { should contain_file('/etc/containerd/config.toml')}
596596
it { should contain_file('/etc/apt/preferences.d/containerd')}
@@ -626,11 +626,11 @@
626626
'container_runtime' => 'cri_containerd',
627627
'kubernetes_package_version' => '1.10.2-00',
628628
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
629-
'containerd_version' => '1.1.0',
629+
'containerd_version' => '1.4.3',
630630
'containerd_install_method' => 'archive',
631631
'containerd_package_name' => 'containerd.io',
632-
'containerd_archive' =>'containerd-1.1.0.linux-amd64.tar.gz',
633-
'containerd_source' => 'https://github.com/containerd-1.1.0.linux-amd64.tar.gz',
632+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
633+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
634634
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
635635
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
636636
'runc_source' => 'https://github.com/runcsource',

0 commit comments

Comments
 (0)