fix: use framework metrics service; use framework log dir; remove stale comments

Author: maltesander

rust/operator-binary/src/controller/build/resource/config_map.rs

@@ -34,8 +34,8 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 /// The rolegroup [`ConfigMap`] configures the rolegroup based on the configuration given by the
 /// administrator.
 ///
-/// `vector_config` is the Vector agent config (`vector.yaml`) built by the caller (where a
-/// `RoleGroupRef` is available); it is `None` when the Vector agent is disabled.
+/// `vector_config` is the Vector agent config (`vector.yaml`) built by the caller; it is `None`
+/// when the Vector agent is disabled.
 pub fn build_rolegroup_config_map(
     cluster: &ValidatedCluster,
     role_group_name: &RoleGroupName,

rust/operator-binary/src/controller/build/resource/daemonset.rs

@@ -51,7 +51,7 @@ use stackable_operator::{
             meta::ownerreference_from_resource,
             pod::container::{EnvVarSet, new_container_builder},
         },
-        product_logging::framework::vector_container,
+        product_logging::framework::{STACKABLE_LOG_DIR, vector_container},
         types::{
             common::Port,
             kubernetes::{ContainerName, VolumeName},
@@ -76,7 +76,6 @@ pub const BUNDLE_BUILDER_PORT: Port = Port(3030);
 stackable_operator::constant!(CONFIG_VOLUME_NAME: VolumeName = "config");
 const CONFIG_DIR: &str = "/stackable/config";
 stackable_operator::constant!(LOG_VOLUME_NAME: VolumeName = "log");
-const STACKABLE_LOG_DIR: &str = "/stackable/log";
 stackable_operator::constant!(BUNDLES_VOLUME_NAME: VolumeName = "bundles");
 const BUNDLES_DIR: &str = "/bundles";
 stackable_operator::constant!(USER_INFO_FETCHER_CREDENTIALS_VOLUME_NAME: VolumeName = "credentials");
@@ -427,7 +426,12 @@ pub fn build_server_rolegroup_daemonset(
                             .headless_service_name()
                             .to_string(),
                     )
-                    .with_service_scope(service::metrics_service_name(cluster, role_group_name))
+                    .with_service_scope(
+                        cluster
+                            .resource_names(role_group_name)
+                            .metrics_service_name()
+                            .to_string(),
+                    )
                     .build()
                     .context(TlsVolumeBuildSnafu)?,
                 )

rust/operator-binary/src/controller/build/resource/service.rs

@@ -117,7 +117,12 @@ pub(crate) fn build_rolegroup_metrics_service(
     let tls_enabled = cluster.cluster_config.tls.is_some();
     let metadata = ObjectMetaBuilder::new()
         .name_and_namespace(cluster)
-        .name(metrics_service_name(cluster, role_group_name))
+        .name(
+            cluster
+                .resource_names(role_group_name)
+                .metrics_service_name()
+                .to_string(),
+        )
         .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
         .with_labels(cluster.recommended_labels(role_group_name))
         .with_labels(prometheus_labels())
@@ -137,21 +142,6 @@ pub(crate) fn build_rolegroup_metrics_service(
     }
 }
 
-/// The metrics [`Service`] name, `<cluster>-<role>-<rolegroup>-metrics`.
-///
-/// [`ResourceNames`](stackable_operator::v2::role_group_utils::ResourceNames) has no metrics
-/// service helper, so the `-metrics` suffix is appended to the qualified role-group name (which is
-/// also the StatefulSet/DaemonSet name).
-pub(crate) fn metrics_service_name(
-    cluster: &ValidatedCluster,
-    role_group_name: &RoleGroupName,
-) -> String {
-    format!(
-        "{qualified}-metrics",
-        qualified = cluster.resource_names(role_group_name).stateful_set_name()
-    )
-}
-
 fn data_service_ports(tls_enabled: bool) -> Vec<ServicePort> {
     let (port_name, port) = if tls_enabled {
         (APP_TLS_PORT_NAME, APP_TLS_PORT)

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

@@ -82,9 +82,9 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 
 /// Validated logging configuration for a role group.
 ///
-/// Produced up-front by [`validate_logging`] (mirroring hive/opensearch) so that a missing or
-/// invalid Vector aggregator discovery ConfigMap name fails reconciliation during validation
-/// rather than at resource-build time.
+/// Produced up-front by [`validate_logging`] so that a missing or invalid Vector aggregator
+/// discovery ConfigMap name fails reconciliation during validation rather than at
+/// resource-build time.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ValidatedLogging {
     /// The validated Vector container config, or `None` when the Vector agent is disabled.
@@ -165,7 +165,7 @@ pub fn validate(
                 )?;
 
             // The framework keeps `envOverrides` as a `HashMap<String, String>`; lift it into the
-            // type-safe `EnvVarSet` so the build step matches opensearch/hive.
+            // type-safe `EnvVarSet` consumed by the build step.
             let mut env_overrides = EnvVarSet::new();
             for (name, value) in merged.config.env_overrides {
                 env_overrides = env_overrides.with_value(
@@ -194,7 +194,7 @@ pub fn validate(
                 ValidatedRoleGroup {
                     config: OpaRoleGroupConfig {
                         // Unused for a DaemonSet, but the framework type requires it.
-                        replicas: merged.replicas.unwrap_or(0),
+                        replicas: merged.replicas,
                         config: merged.config.config,
                         config_overrides: merged.config.config_overrides,
                         env_overrides,