Add configuration to sperate host_ip in extproxy and intproxy connection ip (#3290)

* Initial implementation

* Ops wrong ip changed

* Update mirrord/config/src/container.rs

Co-authored-by: Michał Smolarek <[email protected]>

* Tiny

* Schema update

---------

Co-authored-by: Michał Smolarek <[email protected]>

Author: DmitryDodzin

changelog.d/3289.added.md

@@ -0,0 +1 @@
+Add new `container.override_host_ip` config key to override what address will be used as host addr inside the container.

mirrord-schema.json

@@ -613,6 +613,15 @@
             "boolean",
             "null"
           ]
+        },
+        "override_host_ip": {
+          "title": "container.override_host_ip {#container-override_host_ip}",
+          "description": "Allows to override the IP address for the internal proxy to use when connecting to the host machine from within the container.\n\n```json5 { \"container\": { \"override_host_ip\": \"172.17.0.1\" // usual resolution of value from `host.docker.internal` } } ```\n\nThis should be useful if your host machine is exposed with a different IP address than the one bound as host.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "format": "ip"
         }
       },
       "additionalProperties": false

mirrord/cli/src/container.rs

@@ -112,6 +112,12 @@ async fn prepare_proxies<P: Progress + Send + Sync>(
             .await?;
     sub_progress.success(None);
 
+    let extproxy_addr = config
+        .container
+        .override_host_ip
+        .map(|host_ip| SocketAddr::new(host_ip, extproxy_addr.port()))
+        .unwrap_or(extproxy_addr);
+
     let sidecar =
         IntproxySidecar::create(config, runtime, extproxy_addr, tls_setup.as_ref()).await?;
 

mirrord/config/configuration.md

@@ -463,6 +463,22 @@ Defaults to `"/opt/mirrord/lib/libmirrord_layer.so"`.
 
 Don't add `--rm` to sidecar command to prevent cleanup.
 
+### container.override_host_ip {#container-override_host_ip}
+
+Allow the setting of override ip addr for intproxy to use when using mirrord containers
+feature
+
+```json5
+{
+  "container": {
+    "override_host_ip": "172.17.0.1" // usual resolution of value from `host.docker.internal`
+  }
+}
+```
+
+This should be useful if your host machine is exposed via different ip addr than one bound
+as host
+
 ## experimental {#root-experimental}
 
 mirrord Experimental features.

mirrord/config/src/container.rs

@@ -1,3 +1,5 @@
+use std::net::IpAddr;
+
 use mirrord_config_derive::MirrordConfig;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -51,4 +53,21 @@ pub struct ContainerConfig {
     /// Defaults to `"/opt/mirrord/lib/libmirrord_layer.so"`.
     #[config(default = "/opt/mirrord/lib/libmirrord_layer.so")]
     pub cli_image_lib_path: String,
+
+    /// ### container.override_host_ip {#container-override_host_ip}
+    ///
+    /// Allows to override the IP address for the internal proxy to use
+    /// when connecting to the host machine from within the container.
+    ///
+    /// ```json5
+    /// {
+    ///   "container": {
+    ///     "override_host_ip": "172.17.0.1" // usual resolution of value from `host.docker.internal`
+    ///   }
+    /// }
+    /// ```
+    ///
+    /// This should be useful if your host machine is exposed with a different IP address than the
+    /// one bound as host.
+    pub override_host_ip: Option<IpAddr>,
 }