diff --git a/mirrord/agent/Dockerfile b/mirrord/agent/Dockerfile index 8fa93bafeb0..83c97871cae 100644 --- a/mirrord/agent/Dockerfile +++ b/mirrord/agent/Dockerfile @@ -48,6 +48,5 @@ RUN cp /app/target/$(cat /.platform)/release/mirrord-agent /mirrord-agent FROM ghcr.io/metalbear-co/ci-agent-runtime:latest COPY --from=builder /mirrord-agent / -RUN apt install -y kmod CMD ["./mirrord-agent"] diff --git a/mirrord/agent/src/steal/ip_tables.rs b/mirrord/agent/src/steal/ip_tables.rs index 7912804e499..68bddb6a406 100644 --- a/mirrord/agent/src/steal/ip_tables.rs +++ b/mirrord/agent/src/steal/ip_tables.rs @@ -1,6 +1,5 @@ use std::{ fmt::Debug, - process::Command, sync::{Arc, LazyLock}, }; @@ -119,14 +118,6 @@ pub fn new_ip6tables() -> iptables::IPTables { { iptables::new_with_cmd("/usr/sbin/ip6tables-nft") } else { - let output = Command::new("/usr/sbin/ip6tables-legacy") - .arg("--version") - .output() - .unwrap() - .stdout; - let version = String::from_utf8_lossy(&output); - tracing::info!("Using ip6tables-legacy, version: {version}"); - iptables::new_with_cmd("/usr/sbin/ip6tables-legacy") } .expect("IPTables initialization may not fail!") diff --git a/mirrord/agent/src/steal/subscriptions.rs b/mirrord/agent/src/steal/subscriptions.rs index a348f1c8424..0468719bc9c 100644 --- a/mirrord/agent/src/steal/subscriptions.rs +++ b/mirrord/agent/src/steal/subscriptions.rs @@ -79,42 +79,6 @@ impl PortRedirector for IptablesListener { } else { let safe = crate::steal::ip_tables::SafeIpTables::create( if self.ipv6 { - std::process::Command::new("modprobe") - .arg("ip6table_nat") - .output() - .map_err(|e| { - tracing::warn!(%e, "manual modprobe ip6_tables failed"); - AgentError::IPTablesError(format!( - "manual modprobe ip6table_nat failed: {e:?}" - )) - })?; - std::process::Command::new("modprobe") - .arg("ip6_tables") - .output() - .map_err(|e| { - tracing::warn!(%e, "manual modprobe ip6_tables failed"); - AgentError::IPTablesError(format!( - "manual modprobe ip6_tables failed: {e:?}" - )) - })?; - std::process::Command::new("modprobe") - .arg("nf_nat_ipv6") - .output() - .map_err(|e| { - tracing::warn!(%e, "manual modprobe ip6_tables failed"); - AgentError::IPTablesError(format!( - "manual modprobe nf_nat_ipv6 failed: {e:?}" - )) - })?; - std::process::Command::new("modprobe") - .arg("nf_conntrack_ipv6") - .output() - .map_err(|e| { - tracing::warn!(%e, "manual modprobe ip6_tables failed"); - AgentError::IPTablesError(format!( - "manual modprobe nf_conntrack_ipv6 failed: {e:?}" - )) - })?; new_ip6tables() } else { new_iptables()