From 7f82abbc327a63779d05b792cffc90f5ddb20521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Wed, 4 Aug 2021 11:27:04 +0200 Subject: [PATCH 1/2] Updated kube and kube-runtime to 0.58 Due to https://github.com/kube-rs/kube-rs/pull/575 we had to change the where clauses on the owns function, as this doesn't support DynamicTypes anymore. This _should_ not require any changes in the operators themselves, as we don't currently use DynamicTypes. Might break for people who do though. --- Cargo.toml | 4 ++-- src/controller.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 854baca55..d72cf47bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ either = "1.6" futures = "0.3" json-patch = "0.2" k8s-openapi = { version = "0.12", default-features = false } -kube = { version = "0.57", default-features = false, features = ["jsonpatch"] } -kube-runtime = "0.57" +kube = { version = "0.58", default-features = false, features = ["jsonpatch"] } +kube-runtime = "0.58" lazy_static = "1.4" product-config = { git = "https://github.com/stackabletech/product-config.git", branch = "main" } rand = "0.8" diff --git a/src/controller.rs b/src/controller.rs index 44bbd469e..296578e75 100644 --- a/src/controller.rs +++ b/src/controller.rs @@ -229,8 +229,7 @@ where /// You need to make sure to add this `OwnerReference` yourself. pub fn owns(mut self, api: Api, lp: ListParams) -> Self where - Child: Clone + Debug + Resource + DeserializeOwned + Send + 'static, - ::DynamicType: Clone + Debug + Eq + Hash, + Child: Clone + Resource + DeserializeOwned + Debug + Send + 'static, { self.kube_controller = self.kube_controller.owns(api, lp); self From d713b0365a9147f49f6303cc26f57b3bc9a13053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Wed, 4 Aug 2021 11:37:05 +0200 Subject: [PATCH 2/2] Updated kube in dev-dependencies as well. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d72cf47bf..01e47ea6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ backoff = "0.3" [dev-dependencies] k8s-openapi = { version = "0.12", default-features = false, features = ["v1_21"] } -kube = { version = "0.57", default-features = false, features = ["derive"] } +kube = { version = "0.58", default-features = false, features = ["derive"] } rstest = "0.11" serial_test = "0.5" tempfile = "3.2"