bump to op-rs 0.80.0

Author: sbernauer

Cargo.lock

@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.79.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }

Cargo.toml

@@ -8,6 +8,7 @@ use stackable_operator::{
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::api::core::v1::ConfigMap,
     kube::runtime::reflector::ObjectRef,
+    utils::cluster_info::KubernetesClusterInfo,
 };
 
 use crate::{
@@ -43,12 +44,15 @@ pub enum Error {
 /// Creates a discovery config map containing the `hbase-site.xml` for clients.
 pub fn build_discovery_configmap(
     hbase: &HbaseCluster,
+    cluster_info: &KubernetesClusterInfo,
     zookeeper_connection_information: &ZookeeperConnectionInformation,
     resolved_product_image: &ResolvedProductImage,
 ) -> Result<ConfigMap> {
     let mut hbase_site = zookeeper_connection_information.as_hbase_settings();
-    hbase_site
-        .extend(kerberos_discovery_config_properties(hbase).context(AddKerberosDiscoverySnafu)?);
+    hbase_site.extend(
+        kerberos_discovery_config_properties(hbase, cluster_info)
+            .context(AddKerberosDiscoverySnafu)?,
+    );
 
     ConfigMapBuilder::new()
         .metadata(

rust/operator-binary/src/discovery.rs

@@ -60,7 +60,7 @@ use stackable_operator::{
         statefulset::StatefulSetConditionBuilder,
     },
     time::Duration,
-    utils::COMMON_BASH_TRAP_FUNCTIONS,
+    utils::{cluster_info::KubernetesClusterInfo, COMMON_BASH_TRAP_FUNCTIONS},
 };
 use strum::{EnumDiscriminants, IntoStaticStr, ParseError};
 
@@ -374,6 +374,7 @@ pub async fn reconcile_hbase(hbase: Arc<HbaseCluster>, ctx: Arc<Ctx>) -> Result<
     // discovery config map
     let discovery_cm = build_discovery_configmap(
         &hbase,
+        &client.kubernetes_cluster_info,
         &zookeeper_connection_information,
         &resolved_product_image,
     )
@@ -421,6 +422,7 @@ pub async fn reconcile_hbase(hbase: Arc<HbaseCluster>, ctx: Arc<Ctx>) -> Result<
                 build_rolegroup_service(&hbase, &hbase_role, &rolegroup, &resolved_product_image)?;
             let rg_configmap = build_rolegroup_config_map(
                 &hbase,
+                &client.kubernetes_cluster_info,
                 &rolegroup,
                 rolegroup_config,
                 &zookeeper_connection_information,
@@ -549,6 +551,7 @@ pub fn build_region_server_role_service(
 #[allow(clippy::too_many_arguments)]
 fn build_rolegroup_config_map(
     hbase: &HbaseCluster,
+    cluster_info: &KubernetesClusterInfo,
     rolegroup: &RoleGroupRef<HbaseCluster>,
     rolegroup_config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
     zookeeper_connection_information: &ZookeeperConnectionInformation,
@@ -572,8 +575,10 @@ fn build_rolegroup_config_map(
             PropertyNameKind::File(file_name) if file_name == HBASE_SITE_XML => {
                 let mut hbase_site_config = BTreeMap::new();
                 hbase_site_config.extend(zookeeper_connection_information.as_hbase_settings());
-                hbase_site_config
-                    .extend(kerberos_config_properties(hbase).context(AddKerberosConfigSnafu)?);
+                hbase_site_config.extend(
+                    kerberos_config_properties(hbase, cluster_info)
+                        .context(AddKerberosConfigSnafu)?,
+                );
                 hbase_site_config
                     .extend(hbase_opa_config.map_or(vec![], |config| config.hbase_site_config()));