kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move nfs packages to packages.go

This commit is contained in:
John Gardiner Myers 2020-11-13 13:37:47 -08:00
parent 77c4ad4092
commit 2ef4aa2dbb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/miscutils.go
View File

@ -44,7 +44,6 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error {
var packages []string var packages []string
if b.Distribution.IsDebianFamily() { if b.Distribution.IsDebianFamily() {
packages = append(packages, "nfs-common")
if b.IsKubernetesLT("1.20") { if b.IsKubernetesLT("1.20") {
packages = append(packages, "curl") packages = append(packages, "curl")
packages = append(packages, "wget") packages = append(packages, "wget")
@ -56,7 +55,6 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error {
// TODO: These packages have been auto-installed for a long time, and likely we don't need all of them any longer // TODO: These packages have been auto-installed for a long time, and likely we don't need all of them any longer
packages = append(packages, "curl") packages = append(packages, "curl")
packages = append(packages, "wget") packages = append(packages, "wget")
packages = append(packages, "nfs-utils")
packages = append(packages, "python2") packages = append(packages, "python2")
packages = append(packages, "git") packages = append(packages, "git")
} else { } else {

2
nodeup/pkg/model/packages.go
View File

@ -38,6 +38,7 @@ func (b *PackagesBuilder) Build(c *fi.ModelBuilderContext) error {
// ebtables - kops #1711 // ebtables - kops #1711
// ethtool - kops #1830 // ethtool - kops #1830
if b.Distribution.IsDebianFamily() { if b.Distribution.IsDebianFamily() {
c.AddTask(&nodetasks.Package{Name: "nfs-common"})
// From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_ubuntu.yaml // From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_ubuntu.yaml
c.AddTask(&nodetasks.Package{Name: "bridge-utils"}) c.AddTask(&nodetasks.Package{Name: "bridge-utils"})
c.AddTask(&nodetasks.Package{Name: "cgroupfs-mount"}) c.AddTask(&nodetasks.Package{Name: "cgroupfs-mount"})
@ -52,6 +53,7 @@ func (b *PackagesBuilder) Build(c *fi.ModelBuilderContext) error {
c.AddTask(&nodetasks.Package{Name: "socat"}) c.AddTask(&nodetasks.Package{Name: "socat"})
c.AddTask(&nodetasks.Package{Name: "util-linux"}) c.AddTask(&nodetasks.Package{Name: "util-linux"})
} else if b.Distribution.IsRHELFamily() { } else if b.Distribution.IsRHELFamily() {
c.AddTask(&nodetasks.Package{Name: "nfs-utils"})
// From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_centos.yaml // From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_centos.yaml
c.AddTask(&nodetasks.Package{Name: "conntrack-tools"}) c.AddTask(&nodetasks.Package{Name: "conntrack-tools"})
c.AddTask(&nodetasks.Package{Name: "ebtables"}) c.AddTask(&nodetasks.Package{Name: "ebtables"})