Use envy

mirrord/agent/Cargo.toml

@@ -64,6 +64,7 @@ drain.workspace = true
 tokio-rustls = "0.26"
 x509-parser = "0.16"
 rustls.workspace = true
+envy = "0.4"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 iptables = {git = "https://github.com/metalbear-co/rust-iptables.git", rev = "e66c7332e361df3c61a194f08eefe3f40763d624"}

mirrord/agent/src/cli.rs

@@ -41,9 +41,6 @@ pub struct Args {
     /// If not given, the agent will not use TLS.
     #[arg(long, env = AGENT_OPERATOR_CERT_ENV)]
     pub operator_tls_cert_pem: Option<String>,
-
-    #[arg(long)]
-    pub pod_ips: Option<String>,
 }
 
 #[derive(Clone, Debug, Default, Subcommand)]

mirrord/agent/src/entrypoint.rs

@@ -537,15 +537,13 @@ async fn start_agent(args: Args) -> Result<()> {
         let cancellation_token = cancellation_token.clone();
         let watched_task = WatchedTask::new(
             TcpConnectionStealer::TASK_NAME,
-            TcpConnectionStealer::new(stealer_command_rx, args.pod_ips).and_then(
-                |stealer| async move {
-                    let res = stealer.start(cancellation_token).await;
-                    if let Err(err) = res.as_ref() {
-                        error!("Stealer failed: {err}");
-                    }
-                    res
-                },
-            ),
+            TcpConnectionStealer::new(stealer_command_rx).and_then(|stealer| async move {
+                let res = stealer.start(cancellation_token).await;
+                if let Err(err) = res.as_ref() {
+                    error!("Stealer failed: {err}");
+                }
+                res
+            }),
         );
         let status = watched_task.status();
         let task = run_thread_in_namespace(

mirrord/agent/src/steal/connection.rs

@@ -22,6 +22,7 @@ use mirrord_protocol::{
     RemoteError::{BadHttpFilterExRegex, BadHttpFilterRegex},
     RequestId,
 };
+use serde::Deserialize;
 use tokio::{
     net::TcpStream,
     sync::mpsc::{Receiver, Sender},
@@ -260,6 +261,12 @@ impl Client {
     }
 }
 
+#[derive(Deserialize, Debug, Default)]
+struct TcpStealerConfig {
+    stealer_flush_connections: bool,
+    pod_ips: Option<String>,
+}
+
 /// Created once per agent during initialization.
 ///
 /// Meant to be run (see [`TcpConnectionStealer::start`]) in a separate thread while the agent
@@ -286,16 +293,14 @@ impl TcpConnectionStealer {
     /// Initializes a new [`TcpConnectionStealer`], but doesn't start the actual work.
     /// You need to call [`TcpConnectionStealer::start`] to do so.
     #[tracing::instrument(level = "trace")]
-    pub(crate) async fn new(
-        command_rx: Receiver<StealerCommand>,
-        pod_ips: Option<String>,
-    ) -> Result<Self, AgentError> {
+    pub(crate) async fn new(command_rx: Receiver<StealerCommand>) -> Result<Self, AgentError> {
+        let config = envy::prefixed("MIRRORD_AGENT_")
+            .from_env::<TcpStealerConfig>()
+            .unwrap_or_default();
+
         let port_subscriptions = {
-            let flush_connections = std::env::var("MIRRORD_AGENT_STEALER_FLUSH_CONNECTIONS")
-                .ok()
-                .and_then(|var| var.parse::<bool>().ok())
-                .unwrap_or_default();
-            let redirector = IpTablesRedirector::new(flush_connections, pod_ips).await?;
+            let redirector =
+                IpTablesRedirector::new(config.stealer_flush_connections, config.pod_ips).await?;
 
             PortSubscriptions::new(redirector, 4)
         };

mirrord/kube/src/api/container/util.rs

@@ -63,6 +63,10 @@ pub(super) fn agent_env(agent: &AgentConfig, params: &&ContainerParams) -> Vec<E
         env.push(("MIRRORD_AGENT_DNS_TIMEOUT".to_string(), timeout.to_string()));
     };
 
+    if let Some(pod_ips) = params.pod_ips.clone() {
+        env.push(("MIRRORD_AGENT_POD_IPS".to_string(), pod_ips));
+    }
+
     env.into_iter()
         .chain(
             params
@@ -94,11 +98,6 @@ pub(super) fn base_command_line(agent: &AgentConfig, params: &ContainerParams) -
         command_line.push("--test-error".to_owned());
     }
 
-    if let Some(pod_ips) = params.pod_ips.clone() {
-        command_line.push("--pod-ips".to_owned());
-        command_line.push(pod_ips);
-    }
-
     command_line
 }
 

tests/python-e2e/app_flask.py

@@ -5,7 +5,6 @@
 import logging
 import sys
 import threading
-import requests
 
 log = logging.getLogger("werkzeug")
 log.disabled = True
@@ -25,27 +24,6 @@ def kill_thread():
     threading.Thread(target=kill_thread).start()
 
 
-@app.route("/foobar", methods=["GET"])
-def get_foobar():
-    print("GET: Request completed")
-    return "GET"
-
-@app.route("/foobar", methods=["POST"])
-def post_foobar():
-    print("POST: Request completed")
-
-    x = requests.get('http://10.1.62.94/foobar')
-    return x.text
-
-
-@app.route("/foobar", methods=["PUT"])
-def put_foobar():
-    print("PUT: Request completed")
-
-    x = requests.get('http://10.99.79.117/foobar')
-    return x.text
-
-
 @app.route("/", methods=["GET"])
 def get():
     print("GET: Request completed")