From 404b2954f990891fe224da402beaff0930c0a942 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 12 Jan 2023 08:22:31 +0000 Subject: [PATCH] Bump kube to 0.78.0 and k8s-openapi to 0.17.0. Bump k8s version (#533) --- CHANGELOG.md | 2 ++ Cargo.toml | 6 +++--- src/builder/pod/container.rs | 1 + src/commons/resources.rs | 4 ++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e85112c1..8f7d697e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,10 @@ All notable changes to this project will be documented in this file. ### Changed - Disable Vector agent by default ([#526]). +- Bump kube to 0.78.0 and k8s-openapi to 0.17.0. Bump k8s version from 1.24 to 1.26 ([#533]). [#526]: https://github.com/stackabletech/operator-rs/pull/526 +[#533]: https://github.com/stackabletech/operator-rs/pull/533 ## [0.30.1] - 2022-12-19 diff --git a/Cargo.toml b/Cargo.toml index d0197d7d..cce9dac2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,9 @@ clap = { version = "4.0.32", features = ["derive", "cargo", "env"] } const_format = "0.2.30" either = "1.8.0" futures = "0.3.25" -json-patch = "0.2.6" -k8s-openapi = { version = "0.16.0", default-features = false, features = ["schemars", "v1_24"] } -kube = { version = "0.76.0", features = ["jsonpatch", "runtime", "derive"] } +json-patch = "0.3.0" +k8s-openapi = { version = "0.17.0", default-features = false, features = ["schemars", "v1_26"] } +kube = { version = "0.78.0", features = ["jsonpatch", "runtime", "derive"] } lazy_static = "1.4.0" product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.4.0" } rand = "0.8.5" diff --git a/src/builder/pod/container.rs b/src/builder/pod/container.rs index 39f63bb7..2c7184bb 100644 --- a/src/builder/pod/container.rs +++ b/src/builder/pod/container.rs @@ -359,6 +359,7 @@ mod tests { ] .into(), ), + ..ResourceRequirements::default() }; let container = ContainerBuilder::new("testcontainer") diff --git a/src/commons/resources.rs b/src/commons/resources.rs index 8c1e71a7..de0e45bc 100644 --- a/src/commons/resources.rs +++ b/src/commons/resources.rs @@ -310,6 +310,10 @@ impl Into for Resources { } else { Some(requests) }, + // Dynamic resource allocation by using resourceClaims was added as *alpha* feature in Kubernetes 1.26. + // We might want to support it after a while, but currently all the customers would need to active + // the `DynamicResourceAllocation` feature gate. + claims: None, } } }