From ac6b60e35864e340b9c7f946503fcae8e01f9a80 Mon Sep 17 00:00:00 2001 From: Flavio Castelli Date: Mon, 7 Aug 2023 11:50:17 +0200 Subject: [PATCH] fix: ensure code builds even after the deps update Recent version of the Kubewarden SDK require k8s-openapi too, like this policy does. The same version of the k8s-openapi must be used by the two codebases. The Kubewarden SDK requires the k8s-openapi crate only when a specific feature is used. Since this policy doesn't require this feature, we can safely turn it off. Signed-off-by: Flavio Castelli --- Cargo.lock | 17 +---------------- Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bdc3bdc..22630a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,20 +119,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -[[package]] -name = "k8s-openapi" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" -dependencies = [ - "base64", - "bytes", - "chrono", - "serde", - "serde-value", - "serde_json", -] - [[package]] name = "k8s-openapi" version = "0.19.0" @@ -159,7 +145,6 @@ dependencies = [ "anyhow", "cfg-if", "chrono", - "k8s-openapi 0.18.0", "num", "num-derive", "num-traits", @@ -361,7 +346,7 @@ name = "selinux-psp" version = "0.1.12" dependencies = [ "anyhow", - "k8s-openapi 0.19.0", + "k8s-openapi", "kubewarden-policy-sdk", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index ecf9a8c..0b010ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,8 @@ crate-type = ["cdylib"] [dependencies] anyhow = "1.0" -k8s-openapi = { version = "0.19.0", features = ["v1_24"] } -kubewarden-policy-sdk = "0.9.6" +k8s-openapi = { version = "0.19.0", features = ["v1_27"] } +kubewarden-policy-sdk = { version = "0.9.6", default-features = false } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" slog = "2.7"