@@ -8,15 +8,18 @@ use stackable_operator::{
88 utils:: cluster_info:: KubernetesClusterInfo , v2:: types:: operator:: RoleGroupName ,
99} ;
1010
11- use crate :: controller:: {
12- KubernetesResources , ValidatedCluster ,
13- build:: resource:: {
14- config_map:: { self , build_rolegroup_config_map} ,
15- discovery:: { self , build_discovery_config_map} ,
16- pdb:: build_pdb,
17- service:: { build_rolegroup_metrics_service, build_rolegroup_service} ,
18- statefulset:: { self , build_rolegroup_statefulset} ,
11+ use crate :: {
12+ controller:: {
13+ KubernetesResources , ValidatedCluster ,
14+ build:: resource:: {
15+ config_map:: { self , build_rolegroup_config_map} ,
16+ discovery:: { self , build_discovery_config_map} ,
17+ pdb:: build_pdb,
18+ service:: { build_rolegroup_metrics_service, build_rolegroup_service} ,
19+ statefulset:: { self , build_rolegroup_statefulset} ,
20+ } ,
1921 } ,
22+ crd:: HbaseRole ,
2023} ;
2124
2225// Placeholder role-group name used for the recommended labels of the role-level discovery
@@ -25,15 +28,17 @@ stackable_operator::constant!(pub(crate) PLACEHOLDER_DISCOVERY_ROLE_GROUP: RoleG
2528
2629#[ derive( Snafu , Debug ) ]
2730pub enum Error {
28- #[ snafu( display( "failed to build ConfigMap for role group {role_group}" ) ) ]
31+ #[ snafu( display( "failed to build ConfigMap for role {hbase_role} role group {role_group}" ) ) ]
2932 ConfigMap {
3033 source : config_map:: Error ,
34+ hbase_role : HbaseRole ,
3135 role_group : RoleGroupName ,
3236 } ,
3337
34- #[ snafu( display( "failed to build StatefulSet for role group {role_group}" ) ) ]
38+ #[ snafu( display( "failed to build StatefulSet for role {hbase_role} role group {role_group}" ) ) ]
3539 StatefulSet {
3640 source : statefulset:: Error ,
41+ hbase_role : HbaseRole ,
3742 role_group : RoleGroupName ,
3843 } ,
3944
@@ -72,7 +77,8 @@ pub fn build(
7277 ) ) ;
7378 config_maps. push (
7479 build_rolegroup_config_map ( cluster, cluster_info, hbase_role, role_group_name)
75- . context ( ConfigMapSnafu {
80+ . with_context ( |_| ConfigMapSnafu {
81+ hbase_role : hbase_role. clone ( ) ,
7682 role_group : role_group_name. clone ( ) ,
7783 } ) ?,
7884 ) ;
@@ -84,7 +90,8 @@ pub fn build(
8490 rg_config,
8591 service_account_name,
8692 )
87- . context ( StatefulSetSnafu {
93+ . with_context ( |_| StatefulSetSnafu {
94+ hbase_role : hbase_role. clone ( ) ,
8895 role_group : role_group_name. clone ( ) ,
8996 } ) ?,
9097 ) ;
0 commit comments