Fix: node selector (#293)

# Description

Parent ticket: stackabletech/issues#300



Co-authored-by: Felix Hennig <fhennig@users.noreply.github.com>

Author: Felix Hennig

CHANGELOG.md

@@ -6,13 +6,15 @@
 
 - [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#282]).
 - Updated stackable image versions ([#275]).
-- `operator-rs` `0.24.0` -> `0.27.1` ([#277]).
+- `operator-rs` `0.24.0` -> `0.30.1` ([#277], [#293]).
 - Set runAsGroup to 1000 rather than 0 ([#283]).
+- Fixed: `selector` in role groups now works. It was not working before ([#293])
 
 [#275]: https://github.com/stackabletech/hbase-operator/pull/275
 [#277]: https://github.com/stackabletech/hbase-operator/pull/277
 [#282]: https://github.com/stackabletech/hbase-operator/pull/282
 [#283]: https://github.com/stackabletech/hbase-operator/pull/283
+[#293]: https://github.com/stackabletech/hbase-operator/pull/293
 
 ## [0.5.0] - 2022-11-07
 

Cargo.lock

@@ -9,7 +9,7 @@ version = "0.6.0-nightly"
 publish = false
 
 [dependencies]
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" }
 
 serde = "1.0"
 serde_json = "1.0"

rust/crd/Cargo.toml

@@ -12,10 +12,10 @@ use stackable_operator::{
     k8s_openapi::apimachinery::pkg::api::resource::Quantity,
     kube::{runtime::reflector::ObjectRef, CustomResource},
     product_config_utils::{ConfigError, Configuration},
-    role_utils::{Role, RoleGroupRef},
+    role_utils::{Role, RoleGroup, RoleGroupRef},
     schemars::{self, JsonSchema},
 };
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, str::FromStr};
 use strum::{Display, EnumIter, EnumString};
 
 pub const APP_NAME: &str = "hbase";
@@ -47,8 +47,15 @@ pub const JVM_HEAP_FACTOR: f32 = 0.8;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
+    #[snafu(display("the role [{role}] is invalid and does not exist in HBase"))]
+    InvalidRole {
+        source: strum::ParseError,
+        role: String,
+    },
     #[snafu(display("the HBase role [{role}] is missing from spec"))]
     MissingHbaseRole { role: String },
+    #[snafu(display("the HBase role group [{role_group}] is missing from spec"))]
+    MissingHbaseRoleGroup { role_group: String },
     #[snafu(display("fragment validation failure"))]
     FragmentValidationFailure { source: ValidationError },
 }
@@ -278,6 +285,27 @@ impl HbaseCluster {
         }
     }
 
+    /// Get the RoleGroup struct for the given ref
+    pub fn get_role_group(
+        &self,
+        rolegroup_ref: &RoleGroupRef<HbaseCluster>,
+    ) -> Result<&RoleGroup<HbaseConfig>, Error> {
+        let role_variant =
+            HbaseRole::from_str(&rolegroup_ref.role).with_context(|_| InvalidRoleSnafu {
+                role: rolegroup_ref.role.to_owned(),
+            })?;
+        let role = self
+            .get_role(&role_variant)
+            .with_context(|| MissingHbaseRoleSnafu {
+                role: role_variant.to_string(),
+            })?;
+        role.role_groups
+            .get(&rolegroup_ref.role_group)
+            .with_context(|| MissingHbaseRoleGroupSnafu {
+                role_group: rolegroup_ref.role_group.to_owned(),
+            })
+    }
+
     pub fn root_dir(&self) -> String {
         self.spec
             .config

rust/crd/src/lib.rs

@@ -16,12 +16,12 @@ futures = { version = "0.3", features = ["compat"] }
 serde = "1.0"
 snafu = "0.7"
 stackable-hbase-crd = { path = "../crd" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" }
 strum = { version = "0.24", features = ["derive"] }
 tokio = { version = "1.23", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1"
 
 [build-dependencies]
 built = { version =  "0.5", features = ["chrono", "git2"] }
 stackable-hbase-crd = { path = "../crd" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.27.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.30.1" }

rust/operator-binary/Cargo.toml

@@ -151,6 +151,8 @@ pub enum Error {
         source: strum::ParseError,
         role: String,
     },
+    #[snafu(display("failed to retrieve Hbase role group: {source}"))]
+    UnidentifiedHbaseRoleGroup { source: stackable_hbase_crd::Error },
     #[snafu(display("failed to resolve and merge resource config for role and role group"))]
     FailedToResolveResourceConfig { source: stackable_hbase_crd::Error },
     #[snafu(display("invalid java heap config - missing default or value in crd?"))]
@@ -621,6 +623,13 @@ fn build_rolegroup_statefulset(
                     ))
                 })
                 .image_pull_secrets_from_product_image(resolved_product_image)
+                .node_selector_opt(
+                    hbase
+                        .get_role_group(rolegroup_ref)
+                        .context(UnidentifiedHbaseRoleGroupSnafu)?
+                        .selector
+                        .clone(),
+                )
                 .add_container(container)
                 .add_volume(stackable_operator::k8s_openapi::api::core::v1::Volume {
                     name: "hbase-config".to_string(),