fix: use rolegroup global and discovery placeholders

Author: maltesander

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

@@ -1,5 +1,18 @@
 //! Build steps that turn the [`ValidatedCluster`](super::ValidatedCluster) into
 //! Kubernetes resource specifications.
 
+use std::str::FromStr;
+
+use crate::controller::RoleGroupName;
+
 pub mod properties;
 pub mod resource;
+
+// Placeholder role-group name for the recommended labels of the role-level `Service`, which is not
+// bound to a single role group. `global` matches the historical `app.kubernetes.io/role-group`
+// value.
+stackable_operator::constant!(pub(crate) PLACEHOLDER_ROLE_LEVEL_ROLE_GROUP: RoleGroupName = "global");
+
+// Placeholder role-group name for the recommended labels of the discovery `ConfigMap`, which is a
+// cluster-level object not bound to a single role group.
+stackable_operator::constant!(pub(crate) PLACEHOLDER_DISCOVERY_ROLE_GROUP: RoleGroupName = "discovery");

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

@@ -1,18 +1,12 @@
 //! Builds the discovery [`ConfigMap`] clients use to connect to an `OpaCluster`.
-//!
-//! The content comes entirely from the [`ValidatedCluster`] (plus the externally-resolved role
-//! service and `cluster_info`).
-
-use std::str::FromStr;
-
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::configmap::ConfigMapBuilder, k8s_openapi::api::core::v1::ConfigMap,
     utils::cluster_info::KubernetesClusterInfo,
 };
 
 use super::service::{APP_PORT, APP_TLS_PORT};
-use crate::controller::{RoleGroupName, ValidatedCluster};
+use crate::controller::{ValidatedCluster, build::PLACEHOLDER_DISCOVERY_ROLE_GROUP};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -46,10 +40,7 @@ pub fn build_discovery_config_map(
     // Discovery is a cluster-level object (named after the cluster); `discovery` is used as a
     // placeholder role-group name for the recommended labels.
     let metadata = cluster
-        .object_meta(
-            cluster.name.to_string(),
-            &RoleGroupName::from_str("discovery").expect("'discovery' is a valid role group name"),
-        )
+        .object_meta(cluster.name.to_string(), &PLACEHOLDER_DISCOVERY_ROLE_GROUP)
         .build();
 
     let mut cm_builder = ConfigMapBuilder::new();

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

@@ -1,33 +1,28 @@
-use std::{collections::BTreeMap, str::FromStr};
+use std::collections::BTreeMap;
 
 use stackable_operator::{
     k8s_openapi::api::core::v1::{Service, ServicePort, ServiceSpec},
     kvp::{Annotations, Labels},
     v2::types::common::Port,
 };
 
-use crate::controller::{RoleGroupName, ValidatedCluster};
+use crate::controller::{
+    RoleGroupName, ValidatedCluster, build::PLACEHOLDER_ROLE_LEVEL_ROLE_GROUP,
+};
 
 pub const APP_PORT: Port = Port(8081);
 pub const APP_TLS_PORT: Port = Port(8443);
 pub const APP_PORT_NAME: &str = "http";
 pub const APP_TLS_PORT_NAME: &str = "https";
 pub const METRICS_PORT_NAME: &str = "metrics";
 
-/// The role-level `Service` and the discovery `ConfigMap` are not bound to a single role group, but
-/// the recommended labels require one. `global` is used as a placeholder, matching the historical
-/// `app.kubernetes.io/role-group` value.
-fn role_level_role_group_name() -> RoleGroupName {
-    RoleGroupName::from_str("global").expect("'global' is a valid role group name")
-}
-
 /// The server-role service is the primary endpoint that should be used by clients that do not perform internal load balancing,
 /// including targets outside of the cluster.
 pub(crate) fn build_server_role_service(cluster: &ValidatedCluster) -> Service {
     let metadata = cluster
         .object_meta(
             cluster.server_role_service_name(),
-            &role_level_role_group_name(),
+            &PLACEHOLDER_ROLE_LEVEL_ROLE_GROUP,
         )
         .build();