Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion nodeup/pkg/model/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
if b.Distribution.IsDebianFamily() {
// 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"})
if (b.Distribution.IsDebian() && b.Distribution.Version() < 13) || (b.Distribution.IsUbuntu() && b.Distribution.Version() < 25.10) {
c.AddTask(&nodetasks.Package{Name: "cgroupfs-mount"})
}
c.AddTask(&nodetasks.Package{Name: "conntrack"})
c.AddTask(&nodetasks.Package{Name: "ebtables"})
c.AddTask(&nodetasks.Package{Name: "ethtool"})
Expand Down
5 changes: 5 additions & 0 deletions util/pkg/distributions/distributions.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ func (d *Distribution) IsDebianFamily() bool {
return d.packageFormat == "deb"
}

// IsDebian returns true if this distribution is Debian
func (d *Distribution) IsDebian() bool {
return d.project == "debian"
}

// IsUbuntu returns true if this distribution is Ubuntu (but not debian)
func (d *Distribution) IsUbuntu() bool {
return d.project == "ubuntu"
Expand Down
Loading