diff --git a/Cargo.lock b/Cargo.lock index 7dbdebeca0d89..d0d7cdd5d0e6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -401,8 +401,18 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -419,13 +429,38 @@ dependencies = [ "syn", ] +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + [[package]] name = "darling_macro" version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", "quote", "syn", ] @@ -712,16 +747,16 @@ dependencies = [ [[package]] name = "gateway-api" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4369c3e046bbeb9c1eadb2a3e954ba7f0fbdbea165c96b7a0e698ac381b736d4" +checksum = "22945b64cd520921b037a237f2ad62c4491993e5d1ab01156269922430486d63" dependencies = [ "delegate", - "k8s-openapi", - "kube", + "k8s-openapi 0.26.0", + "kube 2.0.1", "once_cell", "regex-lite", - "schemars", + "schemars 1.1.0", "serde", "serde_json", "serde_yaml", @@ -1057,7 +1092,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" dependencies = [ - "schemars", + "schemars 0.8.22", "serde", ] @@ -1166,7 +1201,19 @@ checksum = "aa60a41b57ae1a0a071af77dbcf89fc9819cfe66edaf2beeb204c34459dcf0b2" dependencies = [ "base64", "chrono", - "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "k8s-openapi" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d13f06d5326a915becaffabdfab75051b8cdc260c2a5c06c0e90226ede89a692" +dependencies = [ + "base64", + "chrono", + "schemars 1.1.0", "serde", "serde_json", ] @@ -1177,13 +1224,25 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "778f98664beaf4c3c11372721e14310d1ae00f5e2d9aabcf8906c881aa4e9f51" dependencies = [ - "k8s-openapi", - "kube-client", - "kube-core", - "kube-derive", + "k8s-openapi 0.25.0", + "kube-client 1.1.0", + "kube-core 1.1.0", + "kube-derive 1.1.0", "kube-runtime", ] +[[package]] +name = "kube" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e7bb0b6a46502cc20e4575b6ff401af45cfea150b34ba272a3410b78aa014e" +dependencies = [ + "k8s-openapi 0.26.0", + "kube-client 2.0.1", + "kube-core 2.0.1", + "kube-derive 2.0.1", +] + [[package]] name = "kube-client" version = "1.1.0" @@ -1205,8 +1264,8 @@ dependencies = [ "hyper-timeout", "hyper-util", "jsonpath-rust", - "k8s-openapi", - "kube-core", + "k8s-openapi 0.25.0", + "kube-core 1.1.0", "pem", "rustls", "secrecy", @@ -1222,6 +1281,42 @@ dependencies = [ "tracing", ] +[[package]] +name = "kube-client" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4987d57a184d2b5294fdad3d7fc7f278899469d21a4da39a8f6ca16426567a36" +dependencies = [ + "base64", + "bytes", + "chrono", + "either", + "futures", + "home", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-timeout", + "hyper-util", + "jsonpath-rust", + "k8s-openapi 0.26.0", + "kube-core 2.0.1", + "pem", + "rustls", + "secrecy", + "serde", + "serde_json", + "serde_yaml", + "thiserror 2.0.17", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tracing", +] + [[package]] name = "kube-core" version = "1.1.0" @@ -1233,8 +1328,26 @@ dependencies = [ "form_urlencoded", "http", "json-patch", - "k8s-openapi", - "schemars", + "k8s-openapi 0.25.0", + "schemars 0.8.22", + "serde", + "serde-value", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "kube-core" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914bbb770e7bb721a06e3538c0edd2babed46447d128f7c21caa68747060ee73" +dependencies = [ + "chrono", + "derive_more", + "form_urlencoded", + "http", + "k8s-openapi 0.26.0", + "schemars 1.1.0", "serde", "serde-value", "serde_json", @@ -1247,7 +1360,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "079fc8c1c397538628309cfdee20696ebdcc26745f9fb17f89b78782205bd995" dependencies = [ - "darling", + "darling 0.20.11", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", +] + +[[package]] +name = "kube-derive" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03dee8252be137772a6ab3508b81cd797dee62ee771112a2453bc85cbbe150d2" +dependencies = [ + "darling 0.21.3", "proc-macro2", "quote", "serde", @@ -1270,8 +1397,8 @@ dependencies = [ "hashbrown 0.15.5", "hostname", "json-patch", - "k8s-openapi", - "kube-client", + "k8s-openapi 0.25.0", + "kube-client 1.1.0", "parking_lot", "pin-project", "serde", @@ -1299,9 +1426,9 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "k8s-openapi", - "kube-client", - "kube-core", + "k8s-openapi 0.25.0", + "kube-client 1.1.0", + "kube-core 1.1.0", "kube-runtime", "kubert-prometheus-process", "kubert-prometheus-tokio", @@ -1419,9 +1546,9 @@ version = "0.1.0" dependencies = [ "gateway-api", "ipnet", - "k8s-openapi", - "kube", - "schemars", + "k8s-openapi 0.26.0", + "kube 1.1.0", + "schemars 0.8.22", "serde", "serde_json", "serde_yaml", @@ -1439,8 +1566,8 @@ dependencies = [ "chrono", "futures", "http", - "k8s-openapi", - "kube", + "k8s-openapi 0.26.0", + "kube 1.1.0", "kubert", "linkerd-policy-controller-core", "linkerd-policy-controller-k8s-api", @@ -1488,8 +1615,8 @@ dependencies = [ "hyper", "hyper-util", "ipnet", - "k8s-openapi", - "kube", + "k8s-openapi 0.26.0", + "kube 1.1.0", "kubert", "linkerd-policy-controller-core", "linkerd-policy-controller-grpc", @@ -1521,8 +1648,8 @@ dependencies = [ "hyper", "hyper-util", "ipnet", - "k8s-openapi", - "kube", + "k8s-openapi 0.26.0", + "kube 1.1.0", "linkerd-policy-controller-core", "linkerd-policy-controller-grpc", "linkerd-policy-controller-k8s-api", @@ -1530,7 +1657,7 @@ dependencies = [ "maplit", "rand", "regex", - "schemars", + "schemars 0.8.22", "serde", "serde_json", "tokio", @@ -1992,6 +2119,26 @@ dependencies = [ "bitflags", ] +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "regex" version = "1.12.2" @@ -2153,7 +2300,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" dependencies = [ "dyn-clone", - "schemars_derive", + "schemars_derive 0.8.22", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" +dependencies = [ + "dyn-clone", + "ref-cast", + "schemars_derive 1.1.0", "serde", "serde_json", ] @@ -2170,6 +2330,18 @@ dependencies = [ "syn", ] +[[package]] +name = "schemars_derive" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301858a4023d78debd2353c7426dc486001bddc91ae31a76fb1f55132f7e2633" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn", +] + [[package]] name = "scopeguard" version = "1.2.0" diff --git a/Cargo.toml b/Cargo.toml index f54cee5f841ae..a72e7f79a2fdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,10 +15,10 @@ members = [ lto = "thin" [workspace.dependencies] -gateway-api = "0.16" +gateway-api = "0.19" http = "1" hyper = "1" -k8s-openapi = { version = "0.25", features = ["v1_33"] } +k8s-openapi = { version = "0.26", features = ["v1_33"] } kube = { version = "1.1", default-features = false } kubert = { version = "0.25", default-features = false } prometheus-client = { version = "0.23", default-features = false }