Skip to content

Commit

Permalink
update dependencies (metalbear-co#2823)
Browse files Browse the repository at this point in the history
* update dependencies

* rollback json stuff
  • Loading branch information
aviramha authored Oct 11, 2024
1 parent abdee6d commit a006e43
Show file tree
Hide file tree
Showing 12 changed files with 194 additions and 154 deletions.
303 changes: 171 additions & 132 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ reqwest = { version = "0.12", default-features = false, features = [
"socks",
"http2",
] }
kube = { version = "0.95.0", git = "https://github.com/kube-rs/kube", rev = "3c3939f3988f8b8be7d1dbb9326565f3fd1d31eb", default-features = false, features = [
kube = { version = "0.96.0", default-features = false, features = [
"runtime",
"derive",
"client",
Expand Down
1 change: 1 addition & 0 deletions changelog.d/+update-dependencies.changed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update dependencies
14 changes: 7 additions & 7 deletions mirrord/agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ tokio = { workspace = true, features = [
"process",
"signal",
] }
procfs = "0.16.0"
procfs = "0.17.0"
serde.workspace = true
serde_json.workspace = true
pnet = "0.35"
Expand All @@ -43,7 +43,7 @@ tokio-stream.workspace = true
thiserror.workspace = true
hickory-resolver.workspace = true
num-traits.workspace = true
bollard = "0.16"
bollard = "0.17"
tokio-util.workspace = true
rand.workspace = true
streammap-ext.workspace = true
Expand All @@ -58,11 +58,11 @@ hyper = { workspace = true, features = ["full"] }
hyper-util.workspace = true
httparse = "1"
fancy-regex = { workspace = true }
dashmap = { version = "5" }
oci-spec = "0.6.0"
dashmap = { version = "6" }
oci-spec = "0.7.0"
async-trait = "0.1"
tonic = "0.12"
tower = "0.4"
tower = "0.5"
http = "1"
k8s-cri = "0.9"
semver.workspace = true
Expand All @@ -78,7 +78,7 @@ rawsocket = { git = "https://github.com/metalbear-co/rawsocket.git" }


[dev-dependencies]
rstest = "0.21"
mockall = "0.12" # 0.11.3 is broken
rstest = "0.23"
mockall = "0.13"
test_bin = "0.4"
rcgen = "0.13"
2 changes: 1 addition & 1 deletion mirrord/auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ chrono = "0.4"
whoami = { version = "1", optional = true }
home = { version = "0.5", optional = true }
pem = "3"
fs4 = { version = "0.8", features = ["tokio"], optional = true }
fs4 = { version = "0.10", features = ["tokio"], optional = true, default-features = false}
k8s-openapi = { workspace = true, optional = true }
kube = { workspace = true, optional = true }
serde = { version = "1", features = ["derive"] }
Expand Down
6 changes: 3 additions & 3 deletions mirrord/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ mirrord-vpn = { path = "../vpn" }

actix-codec.workspace = true
clap.workspace = true
tun2 = { version = "2", features = ["async"] }
tun2 = { version = "3", features = ["async"] }
tracing.workspace = true
serde_json.workspace = true
serde.workspace = true
Expand Down Expand Up @@ -68,7 +68,7 @@ tokio-rustls = "0.26"
tokio-stream = { workspace = true, features = ["net"] }
tokio-retry = "0.3"
regex.workspace = true
mid = "2.1.0"
mid = "3.0.0"
rand.workspace = true

[target.'cfg(target_os = "macos")'.dependencies]
Expand All @@ -79,4 +79,4 @@ mirrord-sip = { path = "../sip" }
mirrord-layer = { artifact = "cdylib", path = "../layer" }

[dev-dependencies]
rstest = "0.21"
rstest = "0.23"
2 changes: 1 addition & 1 deletion mirrord/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ k8s-openapi = { workspace = true, features = ["schemars", "earliest"] }
tera = "1"

[dev-dependencies]
rstest = "0.21"
rstest = "0.23"
2 changes: 1 addition & 1 deletion mirrord/kube/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ base64.workspace = true
http-body.workspace = true
hyper = "1"
rstest = "*"
tower = "0.4"
tower = "0.5"
4 changes: 2 additions & 2 deletions mirrord/layer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ regex.workspace = true
errno = "0.3"
socket2.workspace = true
bytemuck = "1"
hashbrown = "0.14"
hashbrown = "0.15"
exec.workspace = true
syscalls = { version = "0.6", features = ["full"] }
null-terminated = "0.3"
Expand All @@ -63,7 +63,7 @@ hyper = { workspace = true }
rstest = "*"
tempfile = "3"
test-cdylib = "*"
tower = "0.4"
tower = "0.5"
tokio = { version = "1", features = ["rt", "net", "macros"] }
tests = { path = "../../tests" }
flaky_test = "0.2"
Expand Down
4 changes: 2 additions & 2 deletions mirrord/operator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ serde_yaml = { workspace = true, optional = true }
thiserror.workspace = true
semver = { workspace = true, features = ["serde"] }
tokio = { workspace = true, optional = true }
tokio-tungstenite = { version = "0.23", optional = true }
tokio-tungstenite = { version = "0.24", optional = true }
tracing = { workspace = true, optional = true }

[dev-dependencies]
rstest = "0.21"
rstest = "0.23"
2 changes: 1 addition & 1 deletion mirrord/vpn/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ serde_yaml.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["fs", "process"] }
tracing.workspace = true
tun2 = { version = "2", features = ["async"] }
tun2 = { version = "3", features = ["async"] }
6 changes: 3 additions & 3 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ aws-credential-types = "1.2"
aws-sdk-sqs = { version = "1.39", optional = true }
aws-types = "1.3"
json-patch = "2.0"
jsonptr = "0.4.7" # for compatiblity with json-patch
jsonptr = "0.4" # for compatiblity with json-patch
k8s-openapi.workspace = true
kube.workspace = true
reqwest.workspace = true
Expand All @@ -26,14 +26,14 @@ mirrord = { artifact = "bin", path = "../mirrord/cli" }
mirrord-operator = { path = "../mirrord/operator", features = ["setup", "crd"] }
serde = "1"
futures.workspace = true
rstest = "0.21"
rstest = "0.23"
rand = "0.8"
futures-util = "0.3"
wsl = "0.1"
chrono = "0.4"
tempfile = "3"
bytes = "1"
tokio-tungstenite = { version = "0.23" }
tokio-tungstenite = { version = "0.24" }
fancy-regex.workspace = true
hyper.workspace = true
hyper-util.workspace = true
Expand Down

0 comments on commit a006e43

Please sign in to comment.