diff --git a/nodeup/pkg/model/miscutils.go b/nodeup/pkg/model/miscutils.go index 5a96591e6e..ae4eed0b1e 100644 --- a/nodeup/pkg/model/miscutils.go +++ b/nodeup/pkg/model/miscutils.go @@ -44,7 +44,6 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error { var packages []string if b.Distribution.IsDebianFamily() { - packages = append(packages, "nfs-common") if b.IsKubernetesLT("1.20") { packages = append(packages, "curl") 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 packages = append(packages, "curl") packages = append(packages, "wget") - packages = append(packages, "nfs-utils") packages = append(packages, "python2") packages = append(packages, "git") } else { diff --git a/nodeup/pkg/model/packages.go b/nodeup/pkg/model/packages.go index 2f3c08d8a2..a711f2ec2f 100644 --- a/nodeup/pkg/model/packages.go +++ b/nodeup/pkg/model/packages.go @@ -38,6 +38,7 @@ func (b *PackagesBuilder) Build(c *fi.ModelBuilderContext) error { // ebtables - kops #1711 // ethtool - kops #1830 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 c.AddTask(&nodetasks.Package{Name: "bridge-utils"}) 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: "util-linux"}) } 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 c.AddTask(&nodetasks.Package{Name: "conntrack-tools"}) c.AddTask(&nodetasks.Package{Name: "ebtables"})