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

Merge pull request #17587 from ameukam/drop-ebtables-socat 

Drop ebtables, ethtool and socat
This commit is contained in:
Kubernetes Prow Robot 2025-08-29 12:47:09 -07:00 committed by GitHub
parent 62ed422629 25519c973f
commit 6bd7b39827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,6 @@ var _ fi.NodeupModelBuilder = &PackagesBuilder{}
func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error { func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
// kubelet needs: // kubelet needs:
// conntrack - kops #5671 // conntrack - kops #5671
// ebtables - kops #1711
// ethtool - kops #1830
if b.Distribution.IsDebianFamily() { if b.Distribution.IsDebianFamily() {
// 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"})
@ -44,8 +42,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
c.AddTask(&nodetasks.Package{Name: "cgroupfs-mount"}) c.AddTask(&nodetasks.Package{Name: "cgroupfs-mount"})
} }
c.AddTask(&nodetasks.Package{Name: "conntrack"}) c.AddTask(&nodetasks.Package{Name: "conntrack"})
c.AddTask(&nodetasks.Package{Name: "ebtables"})
c.AddTask(&nodetasks.Package{Name: "ethtool"})
c.AddTask(&nodetasks.Package{Name: "iptables"}) c.AddTask(&nodetasks.Package{Name: "iptables"})
c.AddTask(&nodetasks.Package{Name: "libapparmor1"}) c.AddTask(&nodetasks.Package{Name: "libapparmor1"})
c.AddTask(&nodetasks.Package{Name: "libseccomp2"}) c.AddTask(&nodetasks.Package{Name: "libseccomp2"})
@ -54,7 +50,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
c.AddTask(&nodetasks.Package{Name: "nftables"}) c.AddTask(&nodetasks.Package{Name: "nftables"})
} }
c.AddTask(&nodetasks.Package{Name: "pigz"}) c.AddTask(&nodetasks.Package{Name: "pigz"})
c.AddTask(&nodetasks.Package{Name: "socat"})
c.AddTask(&nodetasks.Package{Name: "util-linux"}) c.AddTask(&nodetasks.Package{Name: "util-linux"})
// Additional packages // Additional packages
for _, additionalPackage := range b.NodeupConfig.Packages { for _, additionalPackage := range b.NodeupConfig.Packages {
@ -63,8 +58,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
} else if b.Distribution.IsRHELFamily() { } else if b.Distribution.IsRHELFamily() {
// 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: "ethtool"})
if b.Distribution == distributions.DistributionAmazonLinux2023 { if b.Distribution == distributions.DistributionAmazonLinux2023 {
// install iptables-nft in al2023 (NOT the iptables-legacy!) // install iptables-nft in al2023 (NOT the iptables-legacy!)
c.AddTask(&nodetasks.Package{Name: "iptables-nft"}) c.AddTask(&nodetasks.Package{Name: "iptables-nft"})
@ -76,7 +69,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" { if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" {
c.AddTask(&nodetasks.Package{Name: "nftables"}) c.AddTask(&nodetasks.Package{Name: "nftables"})
} }
c.AddTask(&nodetasks.Package{Name: "socat"})
c.AddTask(&nodetasks.Package{Name: "util-linux"}) c.AddTask(&nodetasks.Package{Name: "util-linux"})
// Handle some packages differently for each distro // Handle some packages differently for each distro
// Amazon Linux 2 doesn't have SELinux enabled by default // Amazon Linux 2 doesn't have SELinux enabled by default