feat: Add the role-group as a node attribute

Author: siegfriedweber

CHANGELOG.md

@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file.
 - Helm: Allow Pod `priorityClassName` to be configured ([#34]).
 - Support log configuration and log aggregation ([#40]).
 - Ensure that the permissions of the configuration files are correct ([#47]).
+- Add the role-group as a node attribute ([#63]).
 
 ### Changed
 
@@ -41,3 +42,4 @@ All notable changes to this project will be documented in this file.
 [#40]: https://github.com/stackabletech/opensearch-operator/pull/40
 [#47]: https://github.com/stackabletech/opensearch-operator/pull/47
 [#58]: https://github.com/stackabletech/opensearch-operator/pull/58
+[#63]: https://github.com/stackabletech/opensearch-operator/pull/63

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

@@ -10,7 +10,7 @@ use crate::{
     controller::OpenSearchRoleGroupConfig,
     crd::v1alpha1,
     framework::{
-        ServiceName,
+        RoleGroupName, ServiceName,
         builder::pod::container::{EnvVarName, EnvVarSet},
         role_group_utils,
     },
@@ -41,6 +41,10 @@ pub const CONFIG_OPTION_INITIAL_CLUSTER_MANAGER_NODES: &str =
 /// Type: string
 pub const CONFIG_OPTION_NETWORK_HOST: &str = "network.host";
 
+/// The custom node attribute "role-group"
+/// Type: string
+pub const CONFIG_OPTION_NODE_ATTR_ROLE_GROUP: &str = "node.attr.role-group";
+
 /// A descriptive name for the node.
 /// Type: string
 pub const CONFIG_OPTION_NODE_NAME: &str = "node.name";
@@ -61,6 +65,7 @@ pub const CONFIG_OPTION_PLUGINS_SECURITY_SSL_HTTP_ENABLED: &str =
 /// Configuration of an OpenSearch node based on the cluster and role-group configuration
 pub struct NodeConfig {
     cluster: ValidatedCluster,
+    role_group_name: RoleGroupName,
     role_group_config: OpenSearchRoleGroupConfig,
     discovery_service_name: ServiceName,
 }
@@ -70,11 +75,13 @@ pub struct NodeConfig {
 impl NodeConfig {
     pub fn new(
         cluster: ValidatedCluster,
+        role_group_name: RoleGroupName,
         role_group_config: OpenSearchRoleGroupConfig,
         discovery_service_name: ServiceName,
     ) -> Self {
         Self {
             cluster,
+            role_group_name,
             role_group_config,
             discovery_service_name,
         }
@@ -111,6 +118,10 @@ impl NodeConfig {
                  CONFIG_OPTION_PLUGINS_SECURITY_NODES_DN.to_owned(),
                  json!(["CN=generated certificate for pod".to_owned()]),
              );
+        config.insert(
+            CONFIG_OPTION_NODE_ATTR_ROLE_GROUP.to_owned(),
+            json!(self.role_group_name),
+        );
 
         for (setting, value) in self
             .role_group_config
@@ -311,6 +322,8 @@ mod tests {
         let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.1.0"}"#)
             .expect("should be a valid ProductImage");
 
+        let role_group_name = RoleGroupName::from_str_unsafe("data");
+
         let role_group_config = OpenSearchRoleGroupConfig {
             replicas: test_config.replicas,
             config: ValidatedOpenSearchConfig {
@@ -374,6 +387,7 @@ mod tests {
 
         NodeConfig::new(
             cluster,
+            role_group_name,
             role_group_config,
             ServiceName::from_str_unsafe("my-opensearch-cluster-manager"),
         )
@@ -391,6 +405,7 @@ mod tests {
                 "cluster.name: \"my-opensearch-cluster\"\n",
                 "discovery.type: \"zen\"\n",
                 "network.host: \"0.0.0.0\"\n",
+                "node.attr.role-group: \"data\"\n",
                 "plugins.security.nodes_dn: [\"CN=generated certificate for pod\"]\n",
                 "test: \"value\""
             )

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

@@ -101,6 +101,7 @@ impl<'a> RoleGroupBuilder<'a> {
             cluster: cluster.clone(),
             node_config: NodeConfig::new(
                 cluster.clone(),
+                role_group_name.clone(),
                 role_group_config.clone(),
                 discovery_service_name,
             ),

tests/templates/kuttl/smoke/10-assert.yaml.j2

@@ -652,6 +652,7 @@ data:
     cluster.routing.allocation.disk.threshold_enabled: "false"
     discovery.type: "zen"
     network.host: "0.0.0.0"
+    node.attr.role-group: "cluster-manager"
     node.store.allow_mmap: "false"
     plugins.security.allow_default_init_securityindex: "true"
     plugins.security.nodes_dn: ["CN=generated certificate for pod"]
@@ -687,6 +688,7 @@ data:
     cluster.routing.allocation.disk.threshold_enabled: "false"
     discovery.type: "zen"
     network.host: "0.0.0.0"
+    node.attr.role-group: "data"
     node.store.allow_mmap: "false"
     plugins.security.allow_default_init_securityindex: "true"
     plugins.security.nodes_dn: ["CN=generated certificate for pod"]