From fcdc98641d563b8cbf1e28109973ed4cd9407701 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 2 Jun 2026 00:00:00 +0000 Subject: [PATCH 1/2] chore: update rust-version to 1.90 this commit updates the `rust-version` field, so that we can update our dependencies to more recent versions. this field has not been updated in many years, which means that we've fallen out of step with the devcontainer used to build linkerd, and cannot pull in equivalent dependencies. see: - https://github.com/linkerd/dev/blob/main/Dockerfile#L9 - https://doc.rust-lang.org/cargo/reference/manifest.html#the-rust-version-field - https://doc.rust-lang.org/cargo/reference/rust-version.html Signed-off-by: katelyn martin --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 29011f535..18e94ec8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://linkerd.io" repository = "https://github.com/linkerd/linkerd2-proxy-api" documentation = "https://docs.rs/linkerd2-proxy-api" keywords = ["linkerd", "grpc", "servicemesh"] -rust-version = "1.59" +rust-version = "1.90" [features] default = [] From 7ab6968c2a8673e9ab14c2e060d14dc7ad3e15a8 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 2 Jun 2026 00:00:00 +0000 Subject: [PATCH 2/2] chore(deny): allow same licenses as linkerd2 see linkerd/linkerd2-proxy-api#562. this commit updates our deny.toml file to allow the same licenses that linkerd2 and linkerd2-proxy allow. this way, we can update our dependency tree to use the same dependencies that our data and control planes use. Signed-off-by: katelyn martin --- deny.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deny.toml b/deny.toml index 42349de1f..0409c03a2 100644 --- a/deny.toml +++ b/deny.toml @@ -25,7 +25,12 @@ exceptions = [ ] allow = [ "Apache-2.0", + "BSD-2-Clause", + "BSD-3-Clause", + "ISC", "MIT", + "Unicode-3.0", + "Zlib", ] confidence-threshold = 0.8