Skip to content

Commit f1bd67b

Browse files
committed
Remove iptables from packages and kernel modules
Podman 6.0 won't support iptables anymore. It's a good opportunity to remove iptables from machine-os too. This is a follow-up of containers/netavark#1353 containers/podman#27555 and related to https://issues.redhat.com/browse/RUN-3723 Signed-off-by: Mario Loriedo <[email protected]>
1 parent 842e336 commit f1bd67b

File tree

4 files changed

+0
-23
lines changed

4 files changed

+0
-23
lines changed

podman-image/Containerfile.COREOS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ ARG FEDORA_VERSION=${FEDORA_VERSION}
77
RUN --mount=type=bind,source=/build_common.sh,target=/run/build_common.sh,z \
88
/run/build_common.sh && ostree container commit
99

10-
COPY podman-iptables.conf /etc/modules-load.d/podman-iptables.conf
11-
1210
# Work around for network-online.target issue https://github.com/containers/podman/issues/26134
1311
COPY podman-user-wait-network-online-override.conf /usr/lib/systemd/user/podman-user-wait-network-online.service.d/podman-user-wait-network-online-override.conf
1412

podman-image/build_common.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ PACKAGES=(
9999
openssh-server
100100
cifs-utils
101101
nfs-utils-coreos
102-
iptables-nft
103102
iproute
104103
dhcp-client
105104

podman-image/podman-iptables.conf

Lines changed: 0 additions & 11 deletions
This file was deleted.

verify/image_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,6 @@ var _ = Describe("run image tests", Ordered, ContinueOnFailure, func() {
181181
Expect(sshSession.outputToString()).To(Equal("inactive"))
182182
})
183183

184-
It("iptables module should be loaded", func() {
185-
skipIfVmtype(WSLVirt, "wsl kernel modules are statically defined in the kernel")
186-
// https://github.com/containers/podman/issues/25153
187-
sshSession, err := mb.setCmd([]string{"machine", "ssh", machineName, "sudo", "lsmod"}).run()
188-
Expect(err).ToNot(HaveOccurred())
189-
Expect(sshSession).To(Exit(0))
190-
Expect(sshSession.outputToString()).To(And(ContainSubstring("ip_tables"), ContainSubstring("ip6_tables")))
191-
})
192-
193184
It("check podman coreos image version", func() {
194185
skipIfVmtype(WSLVirt, "wsl does not use ostree updates")
195186
// set by podman-rpm-info-vars.sh

0 commit comments

Comments
 (0)