From cdda3fead308265f9a496f459e7154b050c6a176 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 18 Jun 2025 08:56:29 +0200 Subject: [PATCH 1/4] refactor(stackable-operator): Remove Result from ListenerOperatorVolumeSourceBuilder::new because it is infallible --- crates/stackable-operator/src/builder/pod/mod.rs | 2 -- crates/stackable-operator/src/builder/pod/volume.rs | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/crates/stackable-operator/src/builder/pod/mod.rs b/crates/stackable-operator/src/builder/pod/mod.rs index 7fe2760a1..7cb46f185 100644 --- a/crates/stackable-operator/src/builder/pod/mod.rs +++ b/crates/stackable-operator/src/builder/pod/mod.rs @@ -396,7 +396,6 @@ impl PodBuilder { ) -> Result<&mut Self> { let listener_reference = ListenerReference::ListenerClass(listener_class.to_string()); let volume = ListenerOperatorVolumeSourceBuilder::new(&listener_reference, labels) - .context(ListenerVolumeSnafu { name: volume_name })? .build_ephemeral() .context(ListenerVolumeSnafu { name: volume_name })?; @@ -483,7 +482,6 @@ impl PodBuilder { ) -> Result<&mut Self> { let listener_reference = ListenerReference::ListenerName(listener_name.to_string()); let volume = ListenerOperatorVolumeSourceBuilder::new(&listener_reference, labels) - .context(ListenerVolumeSnafu { name: volume_name })? .build_ephemeral() .context(ListenerVolumeSnafu { name: volume_name })?; diff --git a/crates/stackable-operator/src/builder/pod/volume.rs b/crates/stackable-operator/src/builder/pod/volume.rs index 66180d0ac..4cfae1940 100644 --- a/crates/stackable-operator/src/builder/pod/volume.rs +++ b/crates/stackable-operator/src/builder/pod/volume.rs @@ -497,11 +497,11 @@ impl ListenerOperatorVolumeSourceBuilder { pub fn new( listener_reference: &ListenerReference, labels: &Labels, - ) -> Result { - Ok(Self { + ) -> ListenerOperatorVolumeSourceBuilder { + Self { listener_reference: listener_reference.to_owned(), labels: labels.to_owned(), - }) + } } fn build_spec(&self) -> PersistentVolumeClaimSpec { @@ -636,8 +636,7 @@ mod tests { let builder = ListenerOperatorVolumeSourceBuilder::new( &ListenerReference::ListenerClass("public".into()), &labels, - ) - .unwrap(); + ); let volume_source = builder.build_ephemeral().unwrap(); From 66dbbdb4fc2517a79dfbb678305ea4c5260c1d2e Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 18 Jun 2025 08:59:55 +0200 Subject: [PATCH 2/4] chore(stackable-operator): Update changelog --- crates/stackable-operator/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index 22d3b2af6..d6d63054c 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed - Update `kube` to `1.1.0` ([#1049]). +- Return type for `ListenerOperatorVolumeSourceBuilder::new()` is no onger a `Result` ([#1058]). ### Removed @@ -14,6 +15,7 @@ All notable changes to this project will be documented in this file. [#1049]: https://github.com/stackabletech/operator-rs/pull/1049 [#1054]: https://github.com/stackabletech/operator-rs/pull/1054 +[#1058]: https://github.com/stackabletech/operator-rs/pull/1058 ## [0.93.2] - 2025-05-26 From 60849d9a1032747cac859fe9fdfc9802cb184572 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 18 Jun 2025 09:04:18 +0200 Subject: [PATCH 3/4] chore(stackable-operator): Update changelog --- crates/stackable-operator/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index d6d63054c..f58582ff1 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed - Update `kube` to `1.1.0` ([#1049]). -- Return type for `ListenerOperatorVolumeSourceBuilder::new()` is no onger a `Result` ([#1058]). +- BREAKING: Return type for `ListenerOperatorVolumeSourceBuilder::new()` is no onger a `Result` ([#1058]). ### Removed From 66f70be791d2764a4d2ea7ca12aeb39e731bf0ba Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 18 Jun 2025 09:06:13 +0200 Subject: [PATCH 4/4] fix(stackable-operator): Remove unwrap from doctest --- crates/stackable-operator/src/builder/pod/volume.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/stackable-operator/src/builder/pod/volume.rs b/crates/stackable-operator/src/builder/pod/volume.rs index 4cfae1940..d27b54aa6 100644 --- a/crates/stackable-operator/src/builder/pod/volume.rs +++ b/crates/stackable-operator/src/builder/pod/volume.rs @@ -471,7 +471,6 @@ pub enum ListenerOperatorVolumeSourceBuilderError { /// &ListenerReference::ListenerClass("nodeport".into()), /// &labels, /// ) -/// .unwrap() /// .build_ephemeral() /// .unwrap(); ///