Skip to content

Commit 699e0bd

Browse files
authored
Merge pull request #54 from puppetlabs/revert-53-cloud-1640-package-mismatch
Revert "(CLOUD-1640) Remove package resource for kubernetes-cni"
2 parents fe5d286 + b2e3c1c commit 699e0bd

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

manifests/packages.pp

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737

3838
default: { notify {"The OS family ${::os_family} is not supported by this module":} }
3939
}
40+
41+
package { 'kubernetes-cni':
42+
ensure => $cni_version,
43+
}
4044
}
4145

4246
elsif $container_runtime == 'cri_containerd' {

spec/classes/packages_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
it { should contain_package('docker-engine').with_ensure('1.12.0-0~xenial')}
1515
it { should contain_package('kubelet').with_ensure('1.7.3-01')}
1616
it { should contain_package('kubectl').with_ensure('1.7.3-01')}
17+
it { should contain_package('kubernetes-cni').with_ensure('0.5.1-00')}
1718
end
1819
end

0 commit comments

Comments
 (0)