Skip to content

Commit 25519c9

Browse files
committed
Drop ebtables, ethtool and socat
Those packages are no longer required according to: - kubernetes/kubernetes#127151 - kubernetes/kubernetes#129131 Signed-off-by: Arnaud Meukam <[email protected]>
1 parent cd4d7ae commit 25519c9

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

nodeup/pkg/model/packages.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,13 @@ var _ fi.NodeupModelBuilder = &PackagesBuilder{}
3535
func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
3636
// kubelet needs:
3737
// conntrack - kops #5671
38-
// ebtables - kops #1711
39-
// ethtool - kops #1830
4038
if b.Distribution.IsDebianFamily() {
4139
// From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_ubuntu.yaml
4240
c.AddTask(&nodetasks.Package{Name: "bridge-utils"})
4341
if (b.Distribution.IsDebian() && b.Distribution.Version() < 13) || (b.Distribution.IsUbuntu() && b.Distribution.Version() < 25.10) {
4442
c.AddTask(&nodetasks.Package{Name: "cgroupfs-mount"})
4543
}
4644
c.AddTask(&nodetasks.Package{Name: "conntrack"})
47-
c.AddTask(&nodetasks.Package{Name: "ebtables"})
48-
c.AddTask(&nodetasks.Package{Name: "ethtool"})
4945
c.AddTask(&nodetasks.Package{Name: "iptables"})
5046
c.AddTask(&nodetasks.Package{Name: "libapparmor1"})
5147
c.AddTask(&nodetasks.Package{Name: "libseccomp2"})
@@ -54,7 +50,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
5450
c.AddTask(&nodetasks.Package{Name: "nftables"})
5551
}
5652
c.AddTask(&nodetasks.Package{Name: "pigz"})
57-
c.AddTask(&nodetasks.Package{Name: "socat"})
5853
c.AddTask(&nodetasks.Package{Name: "util-linux"})
5954
// Additional packages
6055
for _, additionalPackage := range b.NodeupConfig.Packages {
@@ -63,8 +58,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
6358
} else if b.Distribution.IsRHELFamily() {
6459
// From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_centos.yaml
6560
c.AddTask(&nodetasks.Package{Name: "conntrack-tools"})
66-
c.AddTask(&nodetasks.Package{Name: "ebtables"})
67-
c.AddTask(&nodetasks.Package{Name: "ethtool"})
6861
if b.Distribution == distributions.DistributionAmazonLinux2023 {
6962
// install iptables-nft in al2023 (NOT the iptables-legacy!)
7063
c.AddTask(&nodetasks.Package{Name: "iptables-nft"})
@@ -76,7 +69,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
7669
if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" {
7770
c.AddTask(&nodetasks.Package{Name: "nftables"})
7871
}
79-
c.AddTask(&nodetasks.Package{Name: "socat"})
8072
c.AddTask(&nodetasks.Package{Name: "util-linux"})
8173
// Handle some packages differently for each distro
8274
// Amazon Linux 2 doesn't have SELinux enabled by default

0 commit comments

Comments
 (0)