From 87d17a7bfb4e55131346507b4bd92c7da06baa01 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 12 Jan 2023 08:31:37 +0100 Subject: [PATCH 1/3] Bump kube to 0.78.0 and k8s-openapi to 0.17.0. Bump k8s version from 1.24 to 1.26 --- 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 e85112c15..d23c55cef 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 ([#532]). [#526]: https://github.com/stackabletech/operator-rs/pull/526 +[#532]: https://github.com/stackabletech/operator-rs/pull/532 ## [0.30.1] - 2022-12-19 diff --git a/Cargo.toml b/Cargo.toml index 7cadf51f1..ac3e3b08c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,9 @@ clap = { version = "4.0.29", 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 39f63bb75..c007197ba 100644 --- a/src/builder/pod/container.rs +++ b/src/builder/pod/container.rs @@ -359,6 +359,7 @@ mod tests { ] .into(), ), + claims: None, }; let container = ContainerBuilder::new("testcontainer") diff --git a/src/commons/resources.rs b/src/commons/resources.rs index 8c1e71a75..de0e45bcc 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, } } } From f52c8d17b50ea173627ece8e69e534401c7a4fb2 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 12 Jan 2023 09:21:29 +0100 Subject: [PATCH 2/3] Update src/builder/pod/container.rs Co-authored-by: Malte Sander --- src/builder/pod/container.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/builder/pod/container.rs b/src/builder/pod/container.rs index c007197ba..2c7184bbf 100644 --- a/src/builder/pod/container.rs +++ b/src/builder/pod/container.rs @@ -359,7 +359,7 @@ mod tests { ] .into(), ), - claims: None, + ..ResourceRequirements::default() }; let container = ContainerBuilder::new("testcontainer") From 386da33c60a9e41831d07e9568f188da791f4432 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 12 Jan 2023 09:21:45 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Malte Sander --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d23c55cef..8f7d697ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +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 ([#532]). +- 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 -[#532]: https://github.com/stackabletech/operator-rs/pull/532 +[#533]: https://github.com/stackabletech/operator-rs/pull/533 ## [0.30.1] - 2022-12-19