Skip to content

Commit 0155c76

Browse files
danmihai1Redent0r
authored andcommitted
protocols: use protobuf = "=3.7.1"
Use protobuf = "=3.7.1" for both agent and genpolicy, to fix version mismatches with the protobuf crate. Signed-off-by: Dan Mihai <dmihai@microsoft.com>
1 parent 14857b4 commit 0155c76

File tree

6 files changed

+1704
-1204
lines changed

6 files changed

+1704
-1204
lines changed

src/agent/Cargo.toml

Lines changed: 57 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
[workspace]
2-
members = ["rustjail", "policy", "vsock-exporter"]
2+
members = [
3+
"rustjail",
4+
"policy",
5+
"vsock-exporter",
6+
]
37

48
[workspace.package]
5-
authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
9+
authors = [
10+
"The Kata Containers community <kata-dev@lists.katacontainers.io>",
11+
]
612
edition = "2018"
713
license = "Apache-2.0"
814
rust-version = "1.80.0"
915

1016
[workspace.dependencies]
11-
oci-spec = { version = "0.6.8", features = ["runtime"] }
17+
oci-spec = { version = "0.6.8", features = [
18+
"runtime",
19+
] }
1220
lazy_static = "1.3.0"
13-
ttrpc = { version = "0.8.4", features = ["async"], default-features = false }
21+
ttrpc = { version = "0.8.4", features = [
22+
"async",
23+
], default-features = false }
1424
protobuf = "=3.7.1"
1525
libc = "0.2.94"
1626
nix = "0.24.2"
@@ -30,16 +40,19 @@ async-recursion = "0.3.2"
3040
futures = "0.3.30"
3141

3242
# Async runtime
33-
tokio = { version = "1.39.0", features = ["full"] }
43+
tokio = { version = "1.39.0", features = [
44+
"full",
45+
] }
3446
tokio-vsock = "0.3.4"
3547

36-
netlink-sys = { version = "0.7.0", features = ["tokio_socket"] }
48+
netlink-sys = { version = "0.7.0", features = [
49+
"tokio_socket",
50+
] }
3751
rtnetlink = "0.14.0"
3852
netlink-packet-route = "0.19.0"
3953
netlink-packet-core = "0.7.0"
4054
ipnetwork = "0.17.0"
4155

42-
4356
slog = "2.5.2"
4457
slog-scope = "4.1.2"
4558
slog-term = "2.9.0"
@@ -49,7 +62,9 @@ slog-stdlog = "4.0.0"
4962
log = "0.4.11"
5063

5164
cfg-if = "1.0.0"
52-
prometheus = { version = "0.13.0", features = ["process"] }
65+
prometheus = { version = "0.13.0", features = [
66+
"process",
67+
] }
5368
procfs = "0.12.0"
5469

5570
anyhow = "1"
@@ -60,20 +75,28 @@ cgroups = { package = "cgroups-rs", version = "0.3.3" }
6075
tracing = "0.1.26"
6176
tracing-subscriber = "0.2.18"
6277
tracing-opentelemetry = "0.13.0"
63-
opentelemetry = { version = "0.14.0", features = ["rt-tokio-current-thread"] }
78+
opentelemetry = { version = "0.14.0", features = [
79+
"rt-tokio-current-thread",
80+
] }
6481

6582
# Configuration
66-
serde = { version = "1.0.129", features = ["derive"] }
83+
serde = { version = "1.0.129", features = [
84+
"derive",
85+
] }
6786
serde_json = "1.0.39"
6887
toml = "0.5.8"
69-
clap = { version = "3.0.1", features = ["derive"] }
88+
clap = { version = "3.0.1", features = [
89+
"derive",
90+
] }
7091
strum = "0.26.2"
7192
strum_macros = "0.26.2"
7293

7394
tempfile = "3.1.0"
7495
which = "4.3.0"
7596
rstest = "0.18.0"
76-
async-std = { version = "1.12.0", features = ["attributes"] }
97+
async-std = { version = "1.12.0", features = [
98+
"attributes",
99+
] }
77100

78101
# Local dependencies
79102
kata-agent-policy = { path = "policy" }
@@ -92,7 +115,6 @@ runtime-spec = { path = "../libs/runtime-spec" }
92115
safe-path = { path = "../libs/safe-path" }
93116
test-utils = { path = "../libs/test-utils" }
94117

95-
96118
[package]
97119
name = "kata-agent"
98120
version = "0.1.0"
@@ -172,7 +194,10 @@ cdi = { git = "https://github.com/cncf-tags/container-device-interface-rs", rev
172194
kata-agent-policy = { workspace = true, optional = true }
173195
mem-agent.workspace = true
174196
rustjail.workspace = true
175-
protocols = { workspace = true, features = ["async", "with-serde"] }
197+
protocols = { workspace = true, features = [
198+
"async",
199+
"with-serde",
200+
] }
176201
kata-sys-util.workspace = true
177202
kata-types.workspace = true
178203
runtime-spec.workspace = true
@@ -185,7 +210,10 @@ vsock-exporter.workspace = true
185210
# Initdata
186211
base64 = "0.22"
187212
sha2 = "0.10.8"
188-
async-compression = { version = "0.4.22", features = ["tokio", "gzip"] }
213+
async-compression = { version = "0.4.22", features = [
214+
"tokio",
215+
"gzip",
216+
] }
189217

190218
[dev-dependencies]
191219
tempfile.workspace = true
@@ -200,11 +228,20 @@ lto = true
200228

201229
[features]
202230
# The default-pull feature supports all sharing images by virtio-fs, for guest-pull build with the guest-pull feature
203-
default-pull = []
204-
seccomp = ["rustjail/seccomp"]
205-
standard-oci-runtime = ["rustjail/standard-oci-runtime"]
206-
agent-policy = ["kata-agent-policy"]
207-
guest-pull = ["image-rs/kata-cc-rustls-tls"]
231+
default-pull = [
232+
]
233+
seccomp = [
234+
"rustjail/seccomp",
235+
]
236+
standard-oci-runtime = [
237+
"rustjail/standard-oci-runtime",
238+
]
239+
agent-policy = [
240+
"kata-agent-policy",
241+
]
242+
guest-pull = [
243+
"image-rs/kata-cc-rustls-tls",
244+
]
208245

209246
[[bin]]
210247
name = "kata-agent"

0 commit comments

Comments
 (0)