diff --git a/CHANGELOG.md b/CHANGELOG.md index 299e19d495b..85f20ebf3f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,20 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang +## [3.125.2](https://github.com/metalbear-co/mirrord/tree/3.125.2) - 2024-11-29 + + +### Fixed + +- Manually call `docker start ` if after our sidecar `run` command + the container hasn't started yet and is in "created" status. + [#2927](https://github.com/metalbear-co/mirrord/issues/2927) + + +### Internal + +- Fixed return type of a function in mirrord-operator client code. + ## [3.125.1](https://github.com/metalbear-co/mirrord/tree/3.125.1) - 2024-11-27 diff --git a/Cargo.lock b/Cargo.lock index 4a399a605db..410a445e937 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2372,7 +2372,7 @@ dependencies = [ [[package]] name = "fileops" -version = "3.125.1" +version = "3.125.2" dependencies = [ "libc", ] @@ -3511,7 +3511,7 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "issue1317" -version = "3.125.1" +version = "3.125.2" dependencies = [ "actix-web", "env_logger 0.11.5", @@ -3521,7 +3521,7 @@ dependencies = [ [[package]] name = "issue1776" -version = "3.125.1" +version = "3.125.2" dependencies = [ "errno 0.3.9", "libc", @@ -3530,7 +3530,7 @@ dependencies = [ [[package]] name = "issue1776portnot53" -version = "3.125.1" +version = "3.125.2" dependencies = [ "libc", "socket2", @@ -3538,14 +3538,14 @@ dependencies = [ [[package]] name = "issue1899" -version = "3.125.1" +version = "3.125.2" dependencies = [ "libc", ] [[package]] name = "issue2001" -version = "3.125.1" +version = "3.125.2" dependencies = [ "libc", ] @@ -3871,7 +3871,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "listen_ports" -version = "3.125.1" +version = "3.125.2" [[package]] name = "litemap" @@ -4115,7 +4115,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" [[package]] name = "mirrord" -version = "3.125.1" +version = "3.125.2" dependencies = [ "actix-codec", "clap", @@ -4175,7 +4175,7 @@ dependencies = [ [[package]] name = "mirrord-agent" -version = "3.125.1" +version = "3.125.2" dependencies = [ "actix-codec", "async-trait", @@ -4232,7 +4232,7 @@ dependencies = [ [[package]] name = "mirrord-analytics" -version = "3.125.1" +version = "3.125.2" dependencies = [ "assert-json-diff", "base64 0.22.1", @@ -4246,7 +4246,7 @@ dependencies = [ [[package]] name = "mirrord-auth" -version = "3.125.1" +version = "3.125.2" dependencies = [ "bcder", "chrono", @@ -4267,7 +4267,7 @@ dependencies = [ [[package]] name = "mirrord-config" -version = "3.125.1" +version = "3.125.2" dependencies = [ "bimap", "bitflags 2.6.0", @@ -4290,7 +4290,7 @@ dependencies = [ [[package]] name = "mirrord-config-derive" -version = "3.125.1" +version = "3.125.2" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", @@ -4300,7 +4300,7 @@ dependencies = [ [[package]] name = "mirrord-console" -version = "3.125.1" +version = "3.125.2" dependencies = [ "bincode", "drain", @@ -4316,7 +4316,7 @@ dependencies = [ [[package]] name = "mirrord-intproxy" -version = "3.125.1" +version = "3.125.2" dependencies = [ "bytes", "exponential-backoff", @@ -4346,7 +4346,7 @@ dependencies = [ [[package]] name = "mirrord-intproxy-protocol" -version = "3.125.1" +version = "3.125.2" dependencies = [ "bincode", "mirrord-protocol", @@ -4356,7 +4356,7 @@ dependencies = [ [[package]] name = "mirrord-kube" -version = "3.125.1" +version = "3.125.2" dependencies = [ "actix-codec", "async-stream", @@ -4386,7 +4386,7 @@ dependencies = [ [[package]] name = "mirrord-layer" -version = "3.125.1" +version = "3.125.2" dependencies = [ "actix-codec", "base64 0.22.1", @@ -4436,7 +4436,7 @@ dependencies = [ [[package]] name = "mirrord-layer-macro" -version = "3.125.1" +version = "3.125.2" dependencies = [ "proc-macro2", "quote", @@ -4445,7 +4445,7 @@ dependencies = [ [[package]] name = "mirrord-macros" -version = "3.125.1" +version = "3.125.2" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", @@ -4455,7 +4455,7 @@ dependencies = [ [[package]] name = "mirrord-operator" -version = "3.125.1" +version = "3.125.2" dependencies = [ "base64 0.22.1", "bincode", @@ -4489,7 +4489,7 @@ dependencies = [ [[package]] name = "mirrord-progress" -version = "3.125.1" +version = "3.125.2" dependencies = [ "enum_dispatch", "indicatif", @@ -4523,7 +4523,7 @@ dependencies = [ [[package]] name = "mirrord-sip" -version = "3.125.1" +version = "3.125.2" dependencies = [ "apple-codesign", "object 0.36.5", @@ -4536,7 +4536,7 @@ dependencies = [ [[package]] name = "mirrord-vpn" -version = "3.125.1" +version = "3.125.2" dependencies = [ "futures", "ipnet", @@ -4866,7 +4866,7 @@ dependencies = [ [[package]] name = "outgoing" -version = "3.125.1" +version = "3.125.2" [[package]] name = "outref" @@ -5924,14 +5924,14 @@ dependencies = [ [[package]] name = "rust-bypassed-unix-socket" -version = "3.125.1" +version = "3.125.2" dependencies = [ "tokio", ] [[package]] name = "rust-e2e-fileops" -version = "3.125.1" +version = "3.125.2" dependencies = [ "libc", ] @@ -5947,7 +5947,7 @@ dependencies = [ [[package]] name = "rust-unix-socket-client" -version = "3.125.1" +version = "3.125.2" dependencies = [ "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 70d302d5026..7a08f2c8198 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ resolver = "2" # latest commits on rustls suppress certificate verification [workspace.package] -version = "3.125.1" +version = "3.125.2" edition = "2021" license = "MIT" readme = "README.md" diff --git a/changelog.d/+type-fix.internal.md b/changelog.d/+type-fix.internal.md deleted file mode 100644 index 87e5d77b60b..00000000000 --- a/changelog.d/+type-fix.internal.md +++ /dev/null @@ -1 +0,0 @@ -Fixed return type of a function in mirrord-operator client code. \ No newline at end of file diff --git a/changelog.d/2927.fixed.md b/changelog.d/2927.fixed.md deleted file mode 100644 index 66f98075187..00000000000 --- a/changelog.d/2927.fixed.md +++ /dev/null @@ -1 +0,0 @@ -Manually call `docker start ` if after our sidecar `run` command the container hasn't started yet and is in "created" status. diff --git a/changelog.d/2944.fixed.md b/changelog.d/2944.fixed.md deleted file mode 100644 index f5bf0cfb1b7..00000000000 --- a/changelog.d/2944.fixed.md +++ /dev/null @@ -1 +0,0 @@ -Fix race condition with container run caused by regression diff --git a/mirrord/cli/src/container.rs b/mirrord/cli/src/container.rs index 0b5042a65ac..674500b7bba 100644 --- a/mirrord/cli/src/container.rs +++ b/mirrord/cli/src/container.rs @@ -435,6 +435,19 @@ pub(crate) async fn container_command( .status() .await; + // Keep the files, since this process is going to exit before the new process is actually run + // and uses them perhaps find a way to clean up? (can't wait for container to boot + // successfuly since when it loads other processes it might need it too) + if let Some((cert, key)) = _internal_proxy_tls_guards { + if let Err(err) = cert.keep() { + tracing::warn!(?err, "failed to keep internal proxy certificate"); + } + + if let Err(err) = key.keep() { + tracing::warn!(?err, "failed to keep internal proxy key"); + } + } + if let Err(err) = composed_config_file.keep() { tracing::warn!(?err, "failed to keep composed config file"); }