Fix ephemeral agent creation api using agent namespace (#1842)

* Fix ephemeral agent creation api using agent namespace instead of target. Add note about agent namespace being irrelevant in ephemeral. * changelog * .. * fix * .. * ..
metalbear-co · Aug 23, 2023 · 0e3ceef · 0e3ceef
1 parent f271475
commit 0e3ceef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/changelog.d/+ephemeral-namespace.fixed.md b/changelog.d/+ephemeral-namespace.fixed.md
@@ -0,0 +1,2 @@
+Fix ephemeral agent creation api using agent namespace instead of target.
+Add note about agent namespace being irrelevant in ephemeral.
diff --git a/mirrord-schema.json b/mirrord-schema.json
@@ -310,7 +310,7 @@
         },
         "namespace": {
           "title": "agent.namespace {#agent-namespace}",
-          "description": "Namespace where the agent shall live.\n\nDefaults to the current kubernetes namespace.",
+          "description": "Namespace where the agent shall live. Note: Doesn't work with ephemeral containers. Defaults to the current kubernetes namespace.",
           "type": [
             "string",
             "null"

diff --git a/mirrord/config/src/agent.rs b/mirrord/config/src/agent.rs
@@ -76,7 +76,7 @@ pub struct AgentConfig {
     /// ### agent.namespace {#agent-namespace}
     ///
     /// Namespace where the agent shall live.
-    ///
+    /// Note: Doesn't work with ephemeral containers.
     /// Defaults to the current kubernetes namespace.
     #[config(env = "MIRRORD_AGENT_NAMESPACE")]
     pub namespace: Option<String>,

diff --git a/mirrord/config/src/lib.rs b/mirrord/config/src/lib.rs
@@ -333,6 +333,14 @@ impl LayerConfig {
                 warnings.push(PAUSE_WITHOUT_STEAL_WARNING.to_string());
             }
         }
+
+        if self.agent.ephemeral && self.agent.namespace.is_some() {
+            warnings.push(
+                "Agent namespace is ignored when using an ephemeral container for the agent."
+                    .to_string(),
+            );
+        }
+
         if self
             .feature
             .network

diff --git a/mirrord/kube/src/api/container.rs b/mirrord/kube/src/api/container.rs
@@ -437,7 +437,7 @@ impl ContainerApi for EphemeralContainer {
         }))?;
         debug!("Requesting ephemeral_containers_subresource");
 
-        let pod_api = get_k8s_resource_api(client, agent.namespace.as_deref());
+        let pod_api = get_k8s_resource_api(client, runtime_data.pod_namespace.as_deref());
         let pod: Pod = pod_api.get(&runtime_data.pod_name).await?;
         let pod_spec = pod.spec.ok_or(KubeApiError::PodSpecNotFound)?;
 

diff --git a/mirrord/kube/src/api/runtime.rs b/mirrord/kube/src/api/runtime.rs
@@ -40,6 +40,7 @@ impl Display for ContainerRuntime {
 #[derive(Debug)]
 pub struct RuntimeData {
     pub pod_name: String,
+    pub pod_namespace: Option<String>,
     pub node_name: String,
     pub container_id: String,
     pub container_runtime: ContainerRuntime,
@@ -103,6 +104,7 @@ impl RuntimeData {
 
         Ok(RuntimeData {
             pod_name,
+            pod_namespace: pod.metadata.namespace.clone(),
             node_name,
             container_id,
             container_runtime,