refactor: Simplify build_discovery_configmap params; rename znode validated struct

- build_discovery_configmap drops the redundant `zk` parameter (it was only used
  for an error ObjectRef; the owner reference comes from `owner`) and renames
  `resolved_product_image` to `image`. It keeps `image` + `zookeeper_security` as
  explicit shared params, so both controllers can call it without a shared trait
  or a full ValidatedCluster.
- Rename the znode controller's ValidatedInputs to ValidatedZnode and its
  resolved_product_image field to image, for naming consistency with
  ValidatedCluster.

No behavior change. Build, clippy, the 16 unit tests, and the generated CRD are
all unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: maltesander

rust/operator-binary/src/zk_controller.rs

@@ -449,7 +449,6 @@ pub async fn reconcile_zk(
     // We don't /need/ stability, but it's still nice to avoid spurious changes where possible.
     let mut discovery_hash = FnvHasher::with_key(0);
     let discovery_cm = build::discovery::build_discovery_configmap(
-        zk,
         zk,
         ZK_CONTROLLER_NAME,
         applied_listener,

rust/operator-binary/src/zk_controller/build/discovery.rs

@@ -10,18 +10,17 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{ZOOKEEPER_SERVER_PORT_NAME, ZookeeperRole, security::ZookeeperSecurity, v1alpha1},
+    crd::{ZOOKEEPER_SERVER_PORT_NAME, ZookeeperRole, security::ZookeeperSecurity},
     utils::build_recommended_labels,
 };
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-    #[snafu(display("object {} is missing metadata to build owner reference", zk))]
+    #[snafu(display("object is missing metadata to build owner reference"))]
     ObjectMissingMetadataForOwnerRef {
         source: stackable_operator::builder::meta::Error,
-        zk: ObjectRef<v1alpha1::ZookeeperCluster>,
     },
 
     #[snafu(display("chroot path {} was relative (must be absolute)", chroot))]
@@ -61,15 +60,18 @@ pub enum Error {
     },
 }
 
-/// Build a discovery [`ConfigMap`] containing connection details for a [`v1alpha1::ZookeeperCluster`] from a [`listener::v1alpha1::Listener`].
-#[allow(clippy::too_many_arguments)]
+/// Build a discovery [`ConfigMap`] containing ZooKeeper connection details from a
+/// [`listener::v1alpha1::Listener`].
+///
+/// `owner` owns the ConfigMap (the [`ZookeeperCluster`](crate::crd::v1alpha1::ZookeeperCluster)
+/// for the cluster controller, or the [`ZookeeperZnode`](crate::crd::v1alpha1::ZookeeperZnode)
+/// for the znode controller).
 pub fn build_discovery_configmap(
-    zk: &v1alpha1::ZookeeperCluster,
     owner: &impl Resource<DynamicType = ()>,
     controller_name: &str,
     listener: listener::v1alpha1::Listener,
     chroot: Option<&str>,
-    resolved_product_image: &ResolvedProductImage,
+    image: &ResolvedProductImage,
     zookeeper_security: &ZookeeperSecurity,
 ) -> Result<ConfigMap> {
     let name = owner.name_unchecked();
@@ -98,13 +100,11 @@ pub fn build_discovery_configmap(
                 .name(name)
                 .namespace(namespace)
                 .ownerreference_from_resource(owner, None, Some(true))
-                .with_context(|_| ObjectMissingMetadataForOwnerRefSnafu {
-                    zk: ObjectRef::from_obj(zk),
-                })?
+                .context(ObjectMissingMetadataForOwnerRefSnafu)?
                 .with_recommended_labels(&build_recommended_labels(
                     owner,
                     controller_name,
-                    &resolved_product_image.app_version_label_value,
+                    &image.app_version_label_value,
                     &ZookeeperRole::Server.to_string(),
                     "discovery",
                 ))

rust/operator-binary/src/znode_controller.rs

@@ -238,8 +238,8 @@ pub async fn reconcile_znode(
             match ev {
                 finalizer::Event::Apply(znode) => {
                     let dereferenced = dereferenced_objects.context(DereferenceSnafu)?;
-                    let validate::ValidatedInputs {
-                        resolved_product_image,
+                    let validate::ValidatedZnode {
+                        image,
                         zookeeper_security,
                     } = validate::validate(&znode, &dereferenced, &ctx.operator_environment)
                         .context(ValidateClusterSnafu)?;
@@ -249,7 +249,7 @@ pub async fn reconcile_znode(
                         dereferenced.zk,
                         &zookeeper_security,
                         &znode_path,
-                        &resolved_product_image,
+                        &image,
                     )
                     .await
                 }
@@ -285,7 +285,7 @@ async fn reconcile_apply(
     zk: v1alpha1::ZookeeperCluster,
     zookeeper_security: &ZookeeperSecurity,
     znode_path: &str,
-    resolved_product_image: &ResolvedProductImage,
+    image: &ResolvedProductImage,
 ) -> Result<controller::Action> {
     let mut cluster_resources = ClusterResources::new(
         APP_NAME,
@@ -321,12 +321,11 @@ async fn reconcile_apply(
         })?;
 
     let discovery_cm = build_discovery_configmap(
-        &zk,
         znode,
         ZNODE_CONTROLLER_NAME,
         listener,
         Some(znode_path),
-        resolved_product_image,
+        image,
         zookeeper_security,
     )
     .context(BuildDiscoveryConfigMapSnafu)?;

rust/operator-binary/src/znode_controller/validate.rs

@@ -1,7 +1,7 @@
 //! The validate step in the ZookeeperZnode controller.
 //!
 //! Synchronously validates inputs that don't require a Kubernetes client. Produces
-//! [`ValidatedInputs`], consumed by the rest of `reconcile_znode`.
+//! [`ValidatedZnode`], consumed by the rest of `reconcile_znode`.
 
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
@@ -28,8 +28,8 @@ pub enum Error {
 type Result<T, E = Error> = std::result::Result<T, E>;
 
 /// Synchronous inputs the rest of `reconcile_znode` needs after dereferencing.
-pub struct ValidatedInputs {
-    pub resolved_product_image: ResolvedProductImage,
+pub struct ValidatedZnode {
+    pub image: ResolvedProductImage,
     pub zookeeper_security: ZookeeperSecurity,
 }
 
@@ -38,8 +38,8 @@ pub fn validate(
     _znode: &v1alpha1::ZookeeperZnode,
     dereferenced_objects: &DereferencedObjects,
     operator_environment: &OperatorEnvironmentOptions,
-) -> Result<ValidatedInputs> {
-    let resolved_product_image = dereferenced_objects
+) -> Result<ValidatedZnode> {
+    let image = dereferenced_objects
         .zk
         .spec
         .image
@@ -58,8 +58,8 @@ pub fn validate(
     let zookeeper_security =
         ZookeeperSecurity::new(&dereferenced_objects.zk, resolved_authentication_classes);
 
-    Ok(ValidatedInputs {
-        resolved_product_image,
+    Ok(ValidatedZnode {
+        image,
         zookeeper_security,
     })
 }