Skip to content

Commit c8d9be9

Browse files
jpculpjpculp
authored
Merge pull request #802 from jpculp/20260216-deps
Update Rust dependencies
2 parents 5b29eb5 + 1b15474 commit c8d9be9

12 files changed

Lines changed: 885 additions & 858 deletions

File tree

‎Cargo.lock‎

Lines changed: 833 additions & 800 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ nonzero_ext = "0.3"
4242
# these package versions should be moved in lockstep to match upstream
4343
actix-web = { version = "4.9", features = ["rustls-0_23"] }
4444
tracing-actix-web = "0.7"
45-
opentelemetry-instrumentation-actix-web = { version = "0.22", features = ["metrics"] }
45+
opentelemetry-instrumentation-actix-web = { version = "0.23", features = ["metrics"] }
4646

4747
# opentelemetry dependencies
48-
opentelemetry = { version = "0.29", features = ["metrics"]}
49-
opentelemetry_sdk = { version = "0.29", features = ["rt-tokio-current-thread", "metrics"]}
50-
opentelemetry-prometheus = "0.29"
48+
opentelemetry = { version = "0.31", features = ["metrics"]}
49+
opentelemetry_sdk = { version = "0.31", features = ["rt-tokio-current-thread", "metrics"]}
50+
opentelemetry-prometheus = "0.31"
5151
prometheus = "0.14"
5252

5353
# k8s-openapi must match the version required by kube and enable a k8s version feature
54-
k8s-openapi = { version = "0.21", default-features = false, features = ["v1_24"] }
55-
kube = { version = "0.88", default-features = false, features = [ "derive", "runtime", "rustls-tls" ] }
54+
k8s-openapi = { version = "0.26", default-features = false, features = ["v1_30"] }
55+
kube = { version = "2", default-features = false, features = [ "derive", "runtime", "rustls-tls" ] }
5656

5757
regex = "1"
5858
reqwest = { version = "0.12", default-features = false, features = [ "json", "rustls-tls" ] }
5959
rustls = { version = "0.23", default-features = false, features = ["aws_lc_rs", "logging", "std", "tls12"] }
6060
rustls-pemfile = { version = "2" }
61-
schemars = "0.8"
61+
schemars = "1"
6262
semver = "1"
6363
serde = "1"
6464
serde_json = "1"
@@ -72,4 +72,3 @@ tracing = "0.1"
7272
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter", "json"] }
7373
uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
7474
validator = { version = "0.20", features = ["derive"] }
75-
webpki = { version = "0.22", features = ["std"] }

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ DESTDIR ?= .
2929
# tarball.
3030
DISTFILE ?= $(DESTDIR:/=)/$(subst /,_,$(IMAGE_NAME)).tar.gz
3131

32-
BOTTLEROCKET_SDK_VERSION = v0.65.0
32+
BOTTLEROCKET_SDK_VERSION = v0.70.0
3333

3434
# Tools used during the chart release lifecycle
3535
export KUBECONFORM_VERSION = v0.6.3

‎agent/src/agentclient.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,9 @@ pub mod agentclient_error {
713713
},
714714

715715
#[snafu(display("Unable to operate on BottlerocketShadow: '{}'", error))]
716-
BottlerocketShadowError { error: BottlerocketShadowRWError },
716+
BottlerocketShadowError {
717+
error: Box<BottlerocketShadowRWError>,
718+
},
717719

718720
#[snafu(display("Agent client failed due to internal assertion issue: '{}'", message))]
719721
Assertion { message: String },
@@ -737,7 +739,9 @@ pub mod agentclient_error {
737739

738740
impl From<BottlerocketShadowRWError> for Error {
739741
fn from(err: BottlerocketShadowRWError) -> Self {
740-
Self::BottlerocketShadowError { error: err }
742+
Self::BottlerocketShadowError {
743+
error: Box::new(err),
744+
}
741745
}
742746
}
743747

‎apiserver/Cargo.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ awc = { workspace = true }
2121
opentelemetry-instrumentation-actix-web = { workspace = true }
2222
rustls = { workspace = true }
2323
rustls-pemfile = { workspace = true }
24-
webpki = { workspace = true }
2524
opentelemetry = { workspace = true }
2625
opentelemetry_sdk = { workspace = true }
2726
opentelemetry-prometheus = { workspace = true }
@@ -40,7 +39,7 @@ log = { workspace = true }
4039
mockall = { workspace = true, optional = true }
4140
nonzero_ext = { workspace = true }
4241
reqwest = { workspace = true }
43-
schemars = "0.8.11"
42+
schemars = { workspace = true }
4443
serde = { workspace = true, features = [ "derive" ] }
4544
serde_json = { workspace = true }
4645
snafu = { workspace = true }

‎apiserver/src/auth/authorizor.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,11 @@ pub(crate) mod test {
275275
) -> K8STokenAuthorizor<MockTokenReviewer> {
276276
let mut pod_store = reflector::store::Writer::<Pod>::default();
277277
let pod_reader = pod_store.as_reader();
278-
pod_store.apply_watcher_event(&Event::Restarted(pods));
278+
pod_store.apply_watcher_event(&Event::Init);
279+
for pod in pods {
280+
pod_store.apply_watcher_event(&Event::InitApply(pod));
281+
}
282+
pod_store.apply_watcher_event(&Event::InitDone);
279283

280284
K8STokenAuthorizor::new(reviewer, namespace.to_string(), pod_reader, audiences)
281285
}

‎apiserver/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pub mod apiserver_error {
153153

154154
#[snafu(display("Error creating prometheus registry: '{}'", source))]
155155
PrometheusRegsitry {
156-
source: opentelemetry_sdk::metrics::MetricError,
156+
source: opentelemetry_sdk::error::OTelSdkError,
157157
},
158158
}
159159
}

‎clarify.toml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ license-files = [
3131
expression = "ISC AND (Apache-2.0 OR ISC) AND OpenSSL AND MIT"
3232
license-files = [
3333
{ path = "LICENSE", hash = 0xf308ccd7 },
34-
{ path = "aws-lc/LICENSE", hash = 0xba56ed2c },
34+
{ path = "aws-lc/LICENSE", hash = 0x2ff829bc },
3535
{ path = "aws-lc/third_party/fiat/LICENSE", hash = 0x75829ee2 },
3636
]
3737

@@ -142,9 +142,3 @@ license-files = [
142142
{ path = "LICENSE-MIT", hash = 0x386ca1bc },
143143
{ path = "LICENSE.md", hash = 0xfe66d806 },
144144
]
145-
146-
[clarify.rustls-webpki]
147-
expression = "ISC"
148-
license-files = [
149-
{ path = "LICENSE", hash = 0x001c7e6c },
150-
]

‎controller/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ pub mod controller_error {
190190

191191
#[snafu(display("Error creating prometheus registry: '{}'", source))]
192192
PrometheusRegsitry {
193-
source: opentelemetry_sdk::metrics::MetricError,
193+
source: opentelemetry_sdk::error::OTelSdkError,
194194
},
195195
}
196196
}

‎deny.toml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,3 @@ skip-tree = [
3838
# Deny crates from unknown registries or git repositories.
3939
unknown-registry = "deny"
4040
unknown-git = "deny"
41-
42-
[[licenses.clarify]]
43-
name = "ring"
44-
expression = "Apache-2.0 AND ISC AND MIT AND OpenSSL"
45-
license-files = [
46-
{ path = "LICENSE", hash = 0xd99693a },
47-
{ path = "LICENSE-BoringSSL", hash = 0x8f795a3 },
48-
{ path = "LICENSE-other-bits", hash = 0x8b770de2 },
49-
{ path = "third_party/fiat/LICENSE", hash = 0x931a8dd4 },
50-
{ path = "src/polyfill/once_cell/LICENSE-APACHE", hash = 0x24b54f4b },
51-
{ path = "src/polyfill/once_cell/LICENSE-MIT", hash = 0x69371061 },
52-
]
53-
54-
[[licenses.clarify]]
55-
name = "webpki"
56-
expression = "ISC"
57-
license-files = [
58-
{ path = "LICENSE", hash = 0x001c7e6c }
59-
]
60-
61-
[[licenses.clarify]]
62-
name = "rustls-webpki"
63-
expression = "ISC"
64-
license-files = [
65-
{ path = "LICENSE", hash = 0x001c7e6c },
66-
]

0 commit comments

Comments
 (0)