Skip to content

Commit f3a5ee3

Browse files
committed
revert nft
1 parent d2e3af3 commit f3a5ee3

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

nodeup/pkg/model/kube_proxy.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ func (b *KubeProxyBuilder) Build(c *fi.NodeupModelBuilderContext) error {
9797
})
9898
}
9999

100+
100101
return nil
101102
}
102103

@@ -229,19 +230,6 @@ func (b *KubeProxyBuilder) buildPod() (*v1.Pod, error) {
229230
vol.HostPath.Type = &hostPathType
230231
}
231232

232-
// Mount host nft binary and its shared library dependencies for kube-proxy nftables mode.
233-
// The nft binary on the host is dynamically linked against host libraries
234-
// (e.g. libreadline, libnftnl, libmnl) that are not in the container image.
235-
// LD_LIBRARY_PATH is needed because the container's dynamic linker doesn't
236-
// search /usr/lib64 by default.
237-
if c.ProxyMode == "nftables" {
238-
kubemanifest.AddHostPathMapping(pod, container, "usrsbin", "/usr/sbin", kubemanifest.WithMountPath("/usr/sbin"))
239-
kubemanifest.AddHostPathMapping(pod, container, "usrlib64", "/usr/lib64", kubemanifest.WithMountPath("/usr/lib64"))
240-
container.Env = append(container.Env, v1.EnvVar{
241-
Name: "LD_LIBRARY_PATH",
242-
Value: "/usr/lib64",
243-
})
244-
}
245233

246234
pod.Spec.Containers = append(pod.Spec.Containers, *container)
247235

0 commit comments

Comments
 (0)