Merge branch 'main' into update/rust-2025-01

CHANGELOG.md

@@ -8,6 +8,22 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [3.131.1](https://github.com/metalbear-co/mirrord/tree/3.131.1) - 2025-01-28
+
+
+### Changed
+
+- mirrord commands now accept the `-f`/`--config-file` argument without the value as well.
+  When no value is provided, `./.mirrord/mirrord.json` is assumed.
+  [#1706](https://github.com/metalbear-co/mirrord/issues/1706)
+
+
+### Fixed
+
+- Added ping pong subtask to mirrord-extproxy to keep agent connection alive while it is
+  up. [#3030](https://github.com/metalbear-co/mirrord/issues/3030)
+- `agent.privileged` no longer affects targetless agents' pods.
+
 ## [3.131.0](https://github.com/metalbear-co/mirrord/tree/3.131.0) - 2025-01-27
 
 

Cargo.toml

@@ -27,7 +27,7 @@ resolver = "2"
 
 # latest commits on rustls suppress certificate verification
 [workspace.package]
-version = "3.131.0"
+version = "3.131.1"
 edition = "2021"
 license = "MIT"
 readme = "README.md"

mirrord-schema.json

@@ -284,7 +284,7 @@
         },
         "disabled_capabilities": {
           "title": "agent.disabled_capabilities {#agent-disabled_capabilities}",
-          "description": "Disables specified Linux capabilities for the agent container. If nothing is disabled here, agent uses `NET_ADMIN`, `NET_RAW`, `SYS_PTRACE` and `SYS_ADMIN`.",
+          "description": "Disables specified Linux capabilities for the agent container. If nothing is disabled here, agent uses `NET_ADMIN`, `NET_RAW`, `SYS_PTRACE` and `SYS_ADMIN`.\n\nHas no effect when using the targetless mode, as targetless agent containers have no capabilities.",
           "type": [
             "array",
             "null"
@@ -423,7 +423,7 @@
         },
         "privileged": {
           "title": "agent.privileged {#agent-privileged}",
-          "description": "Run the mirror agent as privileged container. Defaults to `false`.\n\nMight be needed in strict environments such as Bottlerocket.",
+          "description": "Run the mirror agent as privileged container. Defaults to `false`.\n\nMight be needed in strict environments such as Bottlerocket.\n\nHas no effect when using the targetless mode, as targetless agent containers are never privileged.",
           "type": [
             "boolean",
             "null"

mirrord/cli/src/config.rs

@@ -204,7 +204,8 @@ pub(super) struct ExecParams {
     pub disable_version_check: bool,
 
     /// Load config from config file
-    #[arg(short = 'f', long, value_hint = ValueHint::FilePath)]
+    /// When using -f flag without a value, defaults to "./.mirrord/mirrord.json"
+    #[arg(short = 'f', long, value_hint = ValueHint::FilePath, default_missing_value = "./.mirrord/mirrord.json", num_args = 0..=1)]
     pub config_file: Option<PathBuf>,
 
     /// Kube context to use from Kubeconfig
@@ -426,7 +427,8 @@ pub(super) struct PortForwardArgs {
     pub disable_version_check: bool,
 
     /// Load config from config file
-    #[arg(short = 'f', long, value_hint = ValueHint::FilePath)]
+    /// When using -f flag without a value, defaults to "./.mirrord/mirrord.json"
+    #[arg(short = 'f', long, value_hint = ValueHint::FilePath, default_missing_value = "./.mirrord/mirrord.json", num_args = 0..=1)]
     pub config_file: Option<PathBuf>,
 
     /// Kube context to use from Kubeconfig
@@ -587,7 +589,7 @@ pub(super) enum OperatorCommand {
     /// Print operator status
     Status {
         /// Specify config file to use
-        #[arg(short = 'f', long, value_hint = ValueHint::FilePath)]
+        #[arg(short = 'f', long, value_hint = ValueHint::FilePath, default_missing_value = "./.mirrord/mirrord.json", num_args = 0..=1)]
         config_file: Option<PathBuf>,
     },
     /// Operator session management commands.
@@ -727,7 +729,7 @@ impl ListTargetArgs {
 #[derive(Args, Debug)]
 pub(super) struct ExtensionExecArgs {
     /// Specify config file to use
-    #[arg(short = 'f', long, value_hint = ValueHint::FilePath)]
+    #[arg(short = 'f', long, value_hint = ValueHint::FilePath, default_missing_value = "./mirrord.json", num_args = 0..=1)]
     pub config_file: Option<PathBuf>,
     /// Specify target
     #[arg(short = 't')]
@@ -766,7 +768,7 @@ pub(super) enum DiagnoseCommand {
     /// Check network connectivity and provide RTT (latency) statistics.
     Latency {
         /// Specify config file to use
-        #[arg(short = 'f', long, value_hint = ValueHint::FilePath)]
+        #[arg(short = 'f', long, value_hint = ValueHint::FilePath, default_missing_value = "./.mirrord/mirrord.json", num_args = 0..=1)]
         config_file: Option<PathBuf>,
     },
 }
@@ -895,7 +897,8 @@ pub(super) struct VpnArgs {
     pub namespace: Option<String>,
 
     /// Load config from config file
-    #[arg(short = 'f', long, value_hint = ValueHint::FilePath)]
+    /// When using -f flag without a value, defaults to "./.mirrord/mirrord.json"
+    #[arg(short = 'f', long, value_hint = ValueHint::FilePath, default_missing_value = "./.mirrord/mirrord.json", num_args = 0..=1)]
     pub config_file: Option<PathBuf>,
 
     #[cfg(target_os = "macos")]

mirrord/cli/src/error.rs

@@ -113,6 +113,10 @@ pub(crate) enum ExternalProxyError {
     )]
     #[diagnostic(help("{GENERAL_BUG}"))]
     MissingTlsInfo,
+
+    #[error("External proxy ping pong with the agent failed: {0}")]
+    #[diagnostic(help("{GENERAL_BUG}"))]
+    PingPongFailed(String),
 }
 
 /// Errors that can occur when executing the `mirrord intproxy` command.