Skip to content

Commit c60c413

Browse files
Fix tests
1 parent 05aebdf commit c60c413

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

spec/classes/packages_spec.rb

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@
123123
'container_runtime' => 'docker',
124124
'kubernetes_package_version' => '1.10.2',
125125
'docker_version' => '17.03.1.ce-1.el7.centos',
126-
'containerd_version' => '1.5.0',
126+
'containerd_version' => '1.4.3',
127127
'containerd_install_method' => 'archive',
128128
'containerd_package_name' => 'containerd.io',
129-
'containerd_archive' =>'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
130-
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
129+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
130+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
131131
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
132132
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
133133
'runc_source' => 'https://github.com/runcsource',
@@ -210,11 +210,11 @@
210210
'container_runtime' => 'cri_containerd',
211211
'kubernetes_package_version' => '1.10.2',
212212
'docker_version' => '17.03.1.ce-1.el7.centos',
213-
'containerd_version' => '1.5.0',
213+
'containerd_version' => '1.4.3',
214214
'containerd_install_method' => 'package',
215215
'containerd_package_name' => 'containerd.io',
216-
'containerd_archive' =>'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
217-
'containerd_source' => 'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
216+
'containerd_archive' =>'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
217+
'containerd_source' => 'containerd-1.4.3-linux-amd64.tar.gz',
218218
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
219219
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
220220
'runc_source' => 'https://github.com/runcsource',
@@ -246,7 +246,7 @@
246246
it { should contain_kmod__load('br_netfilter')}
247247
it { should contain_sysctl('net.bridge.bridge-nf-call-iptables').with_ensure('present').with_value('1')}
248248
it { should contain_sysctl('net.ipv4.ip_forward').with_ensure('present').with_value('1')}
249-
it { should contain_package('containerd.io').with_ensure('1.5.0')}
249+
it { should contain_package('containerd.io').with_ensure('1.4.3')}
250250
it { should contain_archive('etcd-v3.1.12-linux-amd64.tar.gz')}
251251
it { should contain_package('kubelet').with_ensure('1.10.2')}
252252
it { should contain_package('kubectl').with_ensure('1.10.2')}
@@ -286,11 +286,11 @@
286286
'container_runtime' => 'cri_containerd',
287287
'kubernetes_package_version' => '1.10.2-00',
288288
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
289-
'containerd_version' => '1.5.0',
289+
'containerd_version' => '1.4.3',
290290
'containerd_install_method' => 'archive',
291291
'containerd_package_name' => 'containerd.io',
292-
'containerd_archive' =>'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
293-
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
292+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
293+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
294294
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
295295
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
296296
'runc_source' => 'https://github.com/runcsource',
@@ -324,7 +324,7 @@
324324
it { should contain_sysctl('net.ipv4.ip_forward').with_ensure('present').with_value('1')}
325325
it { should contain_archive('/usr/bin/runc')}
326326
it { should contain_file('/usr/bin/runc')}
327-
it { should contain_archive('containerd-1.5.0-beta.1-linux-amd64.tar.gz')}
327+
it { should contain_archive('containerd-1.4.3-linux-amd64.tar.gz')}
328328
it { should_not contain_archive('etcd-v3.1.12-linux-amd64.tar.gz')}
329329
it { should contain_package('kubelet').with_ensure('1.10.2-00')}
330330
it { should contain_package('kubectl').with_ensure('1.10.2-00')}
@@ -373,11 +373,11 @@
373373
'container_runtime' => 'docker',
374374
'kubernetes_package_version' => '1.10.2',
375375
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
376-
'containerd_version' => '1.5.0',
376+
'containerd_version' => '1.4.3',
377377
'containerd_install_method' => 'archive',
378378
'containerd_package_name' => 'containerd.io',
379-
'containerd_archive' =>'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
380-
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
379+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
380+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
381381
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
382382
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
383383
'runc_source' => 'https://github.com/runcsource',
@@ -460,11 +460,11 @@
460460
'container_runtime' => 'docker',
461461
'kubernetes_package_version' => '1.10.2',
462462
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
463-
'containerd_version' => '1.5.0',
463+
'containerd_version' => '1.4.3',
464464
'containerd_install_method' => 'archive',
465465
'containerd_package_name' => 'containerd.io',
466-
'containerd_archive' =>'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
467-
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
466+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
467+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
468468
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
469469
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
470470
'runc_source' => 'https://github.com/runcsource',
@@ -543,11 +543,11 @@
543543
'container_runtime' => 'cri_containerd',
544544
'kubernetes_package_version' => '1.10.2',
545545
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
546-
'containerd_version' => '1.5.0',
546+
'containerd_version' => '1.4.3',
547547
'containerd_install_method' => 'package',
548548
'containerd_package_name' => 'containerd.io',
549-
'containerd_archive' =>'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
550-
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
549+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
550+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
551551
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
552552
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
553553
'runc_source' => 'https://github.com/runcsource',
@@ -583,7 +583,7 @@
583583
it { should contain_package('kubelet').with_ensure('1.10.2')}
584584
it { should contain_package('kubectl').with_ensure('1.10.2')}
585585
it { should contain_package('kubeadm').with_ensure('1.10.2')}
586-
it { should contain_package('containerd.io').with_ensure('1.5.0')}
586+
it { should contain_package('containerd.io').with_ensure('1.4.3')}
587587
it { should contain_file('/etc/containerd')}
588588
it { should contain_file('/etc/containerd/config.toml')}
589589
it { should contain_file('/etc/apt/preferences.d/containerd')}
@@ -619,11 +619,11 @@
619619
'container_runtime' => 'cri_containerd',
620620
'kubernetes_package_version' => '1.10.2-00',
621621
'docker_version' => '17.03.0~ce-0~ubuntu-xenial',
622-
'containerd_version' => '1.5.0',
622+
'containerd_version' => '1.4.3',
623623
'containerd_install_method' => 'archive',
624624
'containerd_package_name' => 'containerd.io',
625-
'containerd_archive' =>'containerd-1.5.0-beta.1-linux-amd64.tar.gz',
626-
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.5.0-beta.1/containerd-1.5.0-beta.1-linux-amd64.tar.gz',
625+
'containerd_archive' =>'containerd-1.4.3-linux-amd64.tar.gz',
626+
'containerd_source' => 'https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-linux-amd64.tar.gz',
627627
'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
628628
'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
629629
'runc_source' => 'https://github.com/runcsource',

0 commit comments

Comments
 (0)