Merge pull request #17667 from hakman/remove-libltdl

k8s-ci-robot · web-flow · commit dde8f4877b53 · 2025-10-13T12:25:33.000-07:00
Drop the `libltdl` package
diff --git a/nodeup/pkg/model/packages.go b/nodeup/pkg/model/packages.go
@@ -42,7 +42,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 		c.AddTask(&nodetasks.Package{Name: "iptables"})
 		c.AddTask(&nodetasks.Package{Name: "libapparmor1"})
 		c.AddTask(&nodetasks.Package{Name: "libseccomp2"})
-		c.AddTask(&nodetasks.Package{Name: "libltdl7"})
 		if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" {
 			c.AddTask(&nodetasks.Package{Name: "nftables"})
 		}
@@ -62,7 +61,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 			c.AddTask(&nodetasks.Package{Name: "iptables"})
 		}
 		c.AddTask(&nodetasks.Package{Name: "libseccomp"})
-		c.AddTask(&nodetasks.Package{Name: "libtool-ltdl"})
 		if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" {
 			c.AddTask(&nodetasks.Package{Name: "nftables"})
 		}

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ func (b PackagesBuilder) Build(c fi.NodeupModelBuilderContext) error {`
`42`	`42`	`c.AddTask(&nodetasks.Package{Name: "iptables"})`
`43`	`43`	`c.AddTask(&nodetasks.Package{Name: "libapparmor1"})`
`44`	`44`	`c.AddTask(&nodetasks.Package{Name: "libseccomp2"})`
`45`		`- c.AddTask(&nodetasks.Package{Name: "libltdl7"})`
`46`	`45`	`if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" {`
`47`	`46`	`c.AddTask(&nodetasks.Package{Name: "nftables"})`
`48`	`47`	`}`
`@@ -62,7 +61,6 @@ func (b PackagesBuilder) Build(c fi.NodeupModelBuilderContext) error {`
`62`	`61`	`c.AddTask(&nodetasks.Package{Name: "iptables"})`
`63`	`62`	`}`
`64`	`63`	`c.AddTask(&nodetasks.Package{Name: "libseccomp"})`
`65`		`- c.AddTask(&nodetasks.Package{Name: "libtool-ltdl"})`
`66`	`64`	`if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" {`
`67`	`65`	`c.AddTask(&nodetasks.Package{Name: "nftables"})`
`68`	`66`	`}`