fix network interface agent config not propagating to agent (#2541)

* fix network interface agent config not propagating to agent * .. * fix * protocol bump
metalbear-co · Jun 20, 2024 · 156b800 · 156b800
1 parent 639d5e4
commit 156b800
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/changelog.d/2539.fixed.md b/changelog.d/2539.fixed.md
@@ -0,0 +1 @@
+Fix network interface configuration not propagating to agent
diff --git a/mirrord/agent/src/cli.rs b/mirrord/agent/src/cli.rs
@@ -1,7 +1,7 @@
 #![deny(missing_docs)]
 
 use clap::{Parser, Subcommand};
-use mirrord_protocol::{MeshVendor, AGENT_OPERATOR_CERT_ENV};
+use mirrord_protocol::{MeshVendor, AGENT_NETWORK_INTERFACE_ENV, AGENT_OPERATOR_CERT_ENV};
 
 const DEFAULT_RUNTIME: &str = "containerd";
 
@@ -23,7 +23,7 @@ pub struct Args {
     pub communication_timeout: u16,
 
     /// Interface to use
-    #[arg(short = 'i', long)]
+    #[arg(short = 'i', long, env = AGENT_NETWORK_INTERFACE_ENV)]
     pub network_interface: Option<String>,
 
     /// Return an error after accepting the first client connection, in order to test agent error

diff --git a/mirrord/kube/src/api/container/util.rs b/mirrord/kube/src/api/container/util.rs
@@ -4,7 +4,7 @@ use futures::{AsyncBufReadExt, TryStreamExt};
 use k8s_openapi::api::core::v1::{EnvVar, Pod, Toleration};
 use kube::{api::LogParams, Api};
 use mirrord_config::agent::{AgentConfig, LinuxCapability};
-use mirrord_protocol::AGENT_OPERATOR_CERT_ENV;
+use mirrord_protocol::{AGENT_NETWORK_INTERFACE_ENV, AGENT_OPERATOR_CERT_ENV};
 use regex::Regex;
 use tracing::warn;
 
@@ -56,6 +56,9 @@ pub(super) fn agent_env(agent: &AgentConfig, params: &&ContainerParams) -> Vec<E
         ));
     }
 
+    if let Some(interface) = agent.network_interface.as_ref() {
+        env.push((AGENT_NETWORK_INTERFACE_ENV.to_string(), interface.into()));
+    }
     if let Some(timeout) = agent.dns.timeout {
         env.push(("MIRRORD_AGENT_DNS_TIMEOUT".to_string(), timeout.to_string()));
     };

diff --git a/mirrord/protocol/Cargo.toml b/mirrord/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mirrord-protocol"
-version = "1.6.0"
+version = "1.6.1"
 authors.workspace = true
 description.workspace = true
 documentation.workspace = true

diff --git a/mirrord/protocol/src/lib.rs b/mirrord/protocol/src/lib.rs
@@ -100,3 +100,5 @@ impl FromStr for MeshVendor {
 /// This may not be the best place to put this name, but this is the only crate shared by
 /// `mirrord-kube` and `mirrord-agent`.
 pub const AGENT_OPERATOR_CERT_ENV: &str = "MIRRORD_AGENT_OPERATOR_CERT";
+
+pub const AGENT_NETWORK_INTERFACE_ENV: &str = "MIRRORD_AGENT_INTERFACE";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix network interface configuration not propagating to agent