Skip to content

Commit fe5d286

Browse files
abottchenscotty-c
authored andcommitted
(CLOUD-1640) Remove package resource for kubernetes-cni (#53)
Prior to this commit, kubernetes-cni was installed as a separate package resource. Regardless of the version specified, yum would detect the kubelet prerequisite, which would automatically pull the latest version. Since we install kubelet just a few lines later, and that installation will automatically pull the needed version of kubernetes-cni, this package resource appears to not be needed, and causes the incorrect version to get installed. Removing it resolved the errors since the needed dependencies will be pulled in when kubelet is installed. would automatically pull in the most recent version
1 parent 39b0752 commit fe5d286

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

manifests/packages.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
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-
}
4440
}
4541

4642
elsif $container_runtime == 'cri_containerd' {

spec/classes/packages_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
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')}
1817
end
1918
end

0 commit comments

Comments
 (0)