diff --git a/Cargo.lock b/Cargo.lock index 5d835047ee888..e8659ab57f1bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,15 +150,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct", -] - [[package]] name = "darling" version = "0.13.0" @@ -510,6 +501,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.5.1" @@ -548,19 +545,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "ct-logs", - "futures-util", + "http", "hyper", "log", - "rustls", + "rustls 0.20.2", "rustls-native-certs", "tokio", - "tokio-rustls", - "webpki", + "tokio-rustls 0.23.1", ] [[package]] @@ -702,9 +697,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.64.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84dcc2f8ca3f2427a72acc31fa9538159f6b33a97002e315a3fcd5323cf51a2b" +checksum = "9ec231e9ec9e84789f9eb414d1ac40ce6c90d0517fb272a335b4233f2e272b1e" dependencies = [ "k8s-openapi", "kube-client", @@ -715,9 +710,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.64.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8957106140aa24a76de3f7d005966f381b30a4cd6a9c003b3bba6828e9617535" +checksum = "95dddb1fcced906d79cdae530ff39079c2d3772b2d623088fdbebe610bfa8217" dependencies = [ "base64", "bytes", @@ -737,7 +732,7 @@ dependencies = [ "openssl", "pem", "pin-project", - "rustls", + "rustls 0.20.2", "rustls-pemfile", "serde", "serde_json", @@ -749,14 +744,13 @@ dependencies = [ "tower", "tower-http", "tracing", - "webpki", ] [[package]] name = "kube-core" -version = "0.64.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ec73e7d8e937dd055d962af06e635e262fdb6ed341c36ecf659d4fece0a8005" +checksum = "c52b6ab05d160691083430f6f431707a4e05b64903f2ffa0095ee5efde759117" dependencies = [ "chrono", "form_urlencoded", @@ -771,9 +765,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.64.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6651bfae82bc23439da1099174b52bcbf68df065dc33317c912e3c5c5cea43c" +checksum = "b98ff3d647085c6c025083efad0435890867f4bea042fc62d408ab3aeb1cdf66" dependencies = [ "darling", "proc-macro2", @@ -784,9 +778,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.64.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b090d3d7b43e2d60fa93ca51b19fe9f2e05a5252c97880fe834f8fa9f2de605" +checksum = "406280d56304bc79b37af7f78e0d9719a4eebc3f46e5e79663154874b7696a48" dependencies = [ "dashmap", "derivative", @@ -1415,18 +1409,30 @@ dependencies = [ "base64", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] name = "rustls-native-certs" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" dependencies = [ "openssl-probe", - "rustls", + "rustls-pemfile", "schannel", "security-framework", ] @@ -1502,6 +1508,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "security-framework" version = "2.4.2" @@ -1821,9 +1837,20 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" +dependencies = [ + "rustls 0.20.2", + "tokio", + "webpki 0.22.0", ] [[package]] @@ -1918,17 +1945,19 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f70061b0592867f0a60e67a6e699da5fe000c88a360a5b92ebdba9d73b2238c" +checksum = "39ee603d6e665ecc7e0f8d479eedb4626bd4726f0ee6119cee5b3a6bf184cac0" dependencies = [ "base64", + "bitflags", "bytes", "futures-core", "futures-util", "http", "http-body", - "pin-project", + "http-range-header", + "pin-project-lite", "tower-layer", "tower-service", "tracing", @@ -2128,7 +2157,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "tokio-stream", "tokio-util", "tower-service", @@ -2215,6 +2244,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "which" version = "4.2.2" diff --git a/deny.toml b/deny.toml index ae992342edd7f..a932825f0a618 100644 --- a/deny.toml +++ b/deny.toml @@ -39,7 +39,10 @@ multiple-versions = "deny" wildcards = "allow" highlight = "all" deny = [] -skip-tree = [] +skip-tree = [ + # Waiting on seanmonstar/warp#927 + { name = "tokio-rustls" }, +] skip = [] [sources] diff --git a/policy-controller/Cargo.toml b/policy-controller/Cargo.toml index 483fe49b7d87d..c10e5bc687580 100644 --- a/policy-controller/Cargo.toml +++ b/policy-controller/Cargo.toml @@ -15,7 +15,7 @@ anyhow = "1" drain = "0.1" futures = { version = "0.3", default-features = false } hyper = { version = "0.14", features = ["http1", "http2", "runtime", "server"] } -kube = { version = "0.64", default-features = false, features = ["admission", "client"] } +kube = { version = "0.65", default-features = false, features = ["admission", "client"] } linkerd-policy-controller-core = { path = "./core" } linkerd-policy-controller-grpc = { path = "./grpc" } linkerd-policy-controller-k8s-index = { path = "./k8s/index" } diff --git a/policy-controller/k8s/api/Cargo.toml b/policy-controller/k8s/api/Cargo.toml index e9a3c91a2be6e..0f685a16c949b 100644 --- a/policy-controller/k8s/api/Cargo.toml +++ b/policy-controller/k8s/api/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] futures = { version = "0.3", default-features = false } k8s-openapi = { version = "0.13", default-features = false, features = ["v1_16"] } -kube = { version = "0.64", default-features = false, features = ["client", "derive", "runtime"] } +kube = { version = "0.65", default-features = false, features = ["client", "derive", "runtime"] } schemars = "0.8" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/policy-controller/k8s/index/src/server.rs b/policy-controller/k8s/index/src/server.rs index 176320d91cb23..ae10ef6eb3859 100644 --- a/policy-controller/k8s/index/src/server.rs +++ b/policy-controller/k8s/index/src/server.rs @@ -326,8 +326,6 @@ mod tests { port: Port, ) -> k8s::policy::Server { k8s::policy::Server { - api_version: "v1alpha1".to_string(), - kind: "Server".to_string(), metadata: k8s::ObjectMeta { namespace: Some(ns.into()), name: Some(name.into()), diff --git a/policy-controller/k8s/index/src/tests.rs b/policy-controller/k8s/index/src/tests.rs index ab2a9c674539d..e997bad1ef76a 100644 --- a/policy-controller/k8s/index/src/tests.rs +++ b/policy-controller/k8s/index/src/tests.rs @@ -505,8 +505,6 @@ fn mk_server( pod_labels: impl IntoIterator, ) -> k8s::policy::Server { k8s::policy::Server { - api_version: "v1alpha1".to_string(), - kind: "Server".to_string(), metadata: k8s::ObjectMeta { namespace: Some(ns.into()), name: Some(name.into()), @@ -533,8 +531,6 @@ fn mk_authz( client: k8s::policy::authz::Client, ) -> k8s::policy::ServerAuthorization { k8s::policy::ServerAuthorization { - api_version: "v1alpha1".to_string(), - kind: "ServerAuthorization".to_string(), metadata: k8s::ObjectMeta { namespace: Some(ns.into()), name: Some(name.into()),