From fae9ddda977b204dd92c936eb325a526930728c8 Mon Sep 17 00:00:00 2001 From: Flavio Castelli Date: Thu, 25 Jan 2024 09:34:23 +0100 Subject: [PATCH] chore(deps): bump to latest version of k8s libraries Use the lastest version of policy-evaluator, which allows us to use latest version of k8s libraries. Due to some changes to `kube::core::ObjectList`, some of the context-aware sessions had to be updated. Signed-off-by: Flavio Castelli --- Cargo.lock | 86 ++++++++----------- Cargo.toml | 4 +- ...context-aware-unique-ingress-duplicate.yml | 2 + ...text-aware-unique-ingress-no-duplicate.yml | 2 + 4 files changed, 42 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4a89da1..e9f9e439 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -498,7 +498,7 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "burrego" version = "0.3.4" -source = "git+https://github.com/kubewarden/policy-evaluator?tag=v0.14.0#8b0e3874d9297537818d05c2504182e7b054bb96" +source = "git+https://github.com/kubewarden/policy-evaluator?tag=v0.14.1#3ca0392d738d9a3569c98213ec262c46ae92cce3" dependencies = [ "base64 0.21.7", "chrono", @@ -551,13 +551,13 @@ dependencies = [ [[package]] name = "cached" -version = "0.47.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b0116662497bc24e4b177c90eaf8870e39e2714c3fcfa296327a93f593fc21" +checksum = "355face540df58778b96814c48abb3c2ed67c4878a8087ab1819c1fedeec505f" dependencies = [ "ahash", "async-trait", - "cached_proc_macro 0.18.1", + "cached_proc_macro 0.19.1", "cached_proc_macro_types", "futures", "hashbrown 0.14.3", @@ -582,9 +582,9 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f" +checksum = "9d52f526f7cbc875b296856ca8c964a9f6290556922c303a8a3883e3c676e6a1" dependencies = [ "darling 0.14.4", "proc-macro2", @@ -594,9 +594,9 @@ dependencies = [ [[package]] name = "cached_proc_macro_types" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cap-fs-ext" @@ -708,9 +708,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -718,7 +718,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -777,9 +777,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.8" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215" +checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" dependencies = [ "clap", ] @@ -2362,20 +2362,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "k8s-openapi" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" -dependencies = [ - "base64 0.21.7", - "bytes", - "chrono", - "serde", - "serde-value", - "serde_json", -] - [[package]] name = "k8s-openapi" version = "0.21.0" @@ -2400,20 +2386,20 @@ dependencies = [ [[package]] name = "kube" -version = "0.87.2" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3499c8d60c763246c7a213f51caac1e9033f46026904cb89bc8951ae8601f26e" +checksum = "7f358a05ae5408b9e9a80c82326cc6e3141dd15b0d141e46d18873879dd4ec26" dependencies = [ - "k8s-openapi 0.20.0", + "k8s-openapi", "kube-client", "kube-core", ] [[package]] name = "kube-client" -version = "0.87.2" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033450dfa0762130565890dadf2f8835faedf749376ca13345bcd8ecd6b5f29f" +checksum = "ca11c8214a2197b0008948ee0b155fab030d16e2aa7cd1ae88e7236dda760a53" dependencies = [ "base64 0.21.7", "bytes", @@ -2427,7 +2413,7 @@ dependencies = [ "hyper-rustls", "hyper-timeout", "jsonpath-rust", - "k8s-openapi 0.20.0", + "k8s-openapi", "kube-core", "pem 3.0.3", "pin-project", @@ -2447,14 +2433,14 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.87.2" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae" +checksum = "90821c3f37216c297b663a4e27abb354fcdf62082a68bf3123ab456fc21617f1" dependencies = [ "chrono", "form_urlencoded", "http", - "k8s-openapi 0.20.0", + "k8s-openapi", "once_cell", "serde", "serde_json", @@ -2463,14 +2449,14 @@ dependencies = [ [[package]] name = "kubewarden-policy-sdk" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71cad7fdeb3c1228f62b7f7dc882e3be0e230596e0a9f7c1abd70689fc474d66" +checksum = "19701752dee8092ff54a1c4b6c4066911f21a16784274238b5f6823b6e4d017b" dependencies = [ "anyhow", "cfg-if", "chrono", - "k8s-openapi 0.20.0", + "k8s-openapi", "num", "num-derive", "num-traits", @@ -2503,7 +2489,7 @@ dependencies = [ "flate2", "humansize", "itertools 0.12.0", - "k8s-openapi 0.21.0", + "k8s-openapi", "lazy_static", "policy-evaluator", "predicates", @@ -2984,7 +2970,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_plain", - "serde_with 3.5.0", + "serde_with 3.5.1", "sha2", "subtle", "thiserror", @@ -3435,19 +3421,19 @@ dependencies = [ [[package]] name = "policy-evaluator" -version = "0.14.0" -source = "git+https://github.com/kubewarden/policy-evaluator?tag=v0.14.0#8b0e3874d9297537818d05c2504182e7b054bb96" +version = "0.14.1" +source = "git+https://github.com/kubewarden/policy-evaluator?tag=v0.14.1#3ca0392d738d9a3569c98213ec262c46ae92cce3" dependencies = [ "anyhow", "base64 0.21.7", "burrego", - "cached 0.47.0", + "cached 0.48.1", "chrono", "dns-lookup", "email_address", "itertools 0.12.0", "json-patch", - "k8s-openapi 0.20.0", + "k8s-openapi", "kube", "kubewarden-policy-sdk", "lazy_static", @@ -4296,9 +4282,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58c3a1b3e418f61c25b2aeb43fc6c95eaa252b8cecdda67f401943e9e08d33f" +checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c" dependencies = [ "base64 0.21.7", "chrono", @@ -4307,7 +4293,7 @@ dependencies = [ "indexmap 2.1.0", "serde", "serde_json", - "serde_with_macros 3.5.0", + "serde_with_macros 3.5.1", "time", ] @@ -4325,9 +4311,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2068b437a31fc68f25dd7edc296b078f04b45145c199d8eed9866e45f1ff274" +checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298" dependencies = [ "darling 0.20.3", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index a2314c65..69df3982 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,13 +16,13 @@ flate2 = "1.0.28" humansize = "2.1" itertools = "0.12.0" k8s-openapi = { version = "0.21.0", default-features = false, features = [ - "v1_28", + "v1_29", ] } lazy_static = "1.4.0" pulldown-cmark-mdcat = { version = "2.1.1", default-features = false, features = [ "regex-fancy", ] } -policy-evaluator = { git = "https://github.com/kubewarden/policy-evaluator", tag = "v0.14.0" } +policy-evaluator = { git = "https://github.com/kubewarden/policy-evaluator", tag = "v0.14.1" } prettytable-rs = "^0.10" pulldown-cmark = { version = "0.9.3", default-features = false } regex = "1" diff --git a/tests/data/host-capabilities-sessions/context-aware-unique-ingress-duplicate.yml b/tests/data/host-capabilities-sessions/context-aware-unique-ingress-duplicate.yml index d62b8379..81577b76 100644 --- a/tests/data/host-capabilities-sessions/context-aware-unique-ingress-duplicate.yml +++ b/tests/data/host-capabilities-sessions/context-aware-unique-ingress-duplicate.yml @@ -9,6 +9,8 @@ type: Success payload: | { + "apiVersion": "v1", + "kind": "List", "metadata": {"resourceVersion":"450657254"}, "items":[ { diff --git a/tests/data/host-capabilities-sessions/context-aware-unique-ingress-no-duplicate.yml b/tests/data/host-capabilities-sessions/context-aware-unique-ingress-no-duplicate.yml index 603cb634..4915a4f6 100644 --- a/tests/data/host-capabilities-sessions/context-aware-unique-ingress-no-duplicate.yml +++ b/tests/data/host-capabilities-sessions/context-aware-unique-ingress-no-duplicate.yml @@ -9,6 +9,8 @@ type: Success payload: | { + "apiVersion": "v1", + "kind": "List", "metadata": {"resourceVersion":"450657254"}, "items":[ {