Rename opensearch-discovery service to opensearch-seed-nodes and remove the HTTP port

Author: siegfriedweber

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

@@ -33,7 +33,7 @@ pub fn build(names: &ContextNames, cluster: ValidatedCluster) -> KubernetesResou
         listeners.push(role_group_builder.build_listener());
     }
 
-    let cluster_manager_service = role_builder.build_cluster_manager_service();
+    let cluster_manager_service = role_builder.build_seed_nodes_service();
     services.push(cluster_manager_service);
 
     let service_accounts = vec![role_builder.build_service_account()];
@@ -105,10 +105,10 @@ mod tests {
         );
         assert_eq!(
             vec![
-                "my-opensearch-discovery",
                 "my-opensearch-nodes-cluster-manager-headless",
                 "my-opensearch-nodes-coordinating-headless",
-                "my-opensearch-nodes-data-headless"
+                "my-opensearch-nodes-data-headless",
+                "my-opensearch-seed-nodes"
             ],
             extract_resource_names(&resources.services)
         );

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

@@ -104,7 +104,7 @@ pub struct NodeConfig {
     cluster: ValidatedCluster,
     role_group_name: RoleGroupName,
     role_group_config: OpenSearchRoleGroupConfig,
-    pub discovery_service_name: ServiceName,
+    pub seed_nodes_service_name: ServiceName,
 }
 
 // Most functions are public because their configuration values could also be used in environment
@@ -114,13 +114,13 @@ impl NodeConfig {
         cluster: ValidatedCluster,
         role_group_name: RoleGroupName,
         role_group_config: OpenSearchRoleGroupConfig,
-        discovery_service_name: ServiceName,
+        seed_nodes_service_name: ServiceName,
     ) -> Self {
         Self {
             cluster,
             role_group_name,
             role_group_config,
-            discovery_service_name,
+            seed_nodes_service_name,
         }
     }
 
@@ -267,7 +267,7 @@ impl NodeConfig {
             )
             .with_value(
                 &EnvVarName::from_str_unsafe(CONFIG_OPTION_DISCOVERY_SEED_HOSTS),
-                &self.discovery_service_name,
+                &self.seed_nodes_service_name,
             )
             .with_value(
                 &EnvVarName::from_str_unsafe(CONFIG_OPTION_NODE_ROLES),

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

@@ -17,9 +17,7 @@ use stackable_operator::{
     },
 };
 
-use super::role_group_builder::{
-    HTTP_PORT, HTTP_PORT_NAME, RoleGroupBuilder, TRANSPORT_PORT, TRANSPORT_PORT_NAME,
-};
+use super::role_group_builder::{RoleGroupBuilder, TRANSPORT_PORT, TRANSPORT_PORT_NAME};
 use crate::{
     controller::{ContextNames, ValidatedCluster},
     framework::{
@@ -64,7 +62,7 @@ impl<'a> RoleBuilder<'a> {
                     role_group_name.clone(),
                     role_group_config.clone(),
                     self.context_names,
-                    self.resource_names.discovery_service_name(),
+                    self.resource_names.seed_nodes_service_name(),
                 )
             })
             .collect()
@@ -101,28 +99,14 @@ impl<'a> RoleBuilder<'a> {
     }
 
     /// Builds a Service that references all nodes with the cluster_manager node role
-    ///
-    /// Initially, this service was meant to be used by
-    /// [`super::node_config::NodeConfig::initial_cluster_manager_nodes`], but the function uses now another approach.
-    /// Afterwards, it was meant to be used as an entry point to OpenSearch, but it could also make
-    /// sense to use coordinating only nodes as entry points and not cluster manager nodes.
-    /// Therefore, this service will bei either adapted or removed. There is already an according
-    /// task entry in <https://github.com/stackabletech/opensearch-operator/issues/1>.
-    pub fn build_cluster_manager_service(&self) -> Service {
-        let ports = vec![
-            ServicePort {
-                name: Some(HTTP_PORT_NAME.to_owned()),
-                port: HTTP_PORT.into(),
-                ..ServicePort::default()
-            },
-            ServicePort {
-                name: Some(TRANSPORT_PORT_NAME.to_owned()),
-                port: TRANSPORT_PORT.into(),
-                ..ServicePort::default()
-            },
-        ];
+    pub fn build_seed_nodes_service(&self) -> Service {
+        let ports = vec![ServicePort {
+            name: Some(TRANSPORT_PORT_NAME.to_owned()),
+            port: TRANSPORT_PORT.into(),
+            ..ServicePort::default()
+        }];
 
-        let metadata = self.common_metadata(self.resource_names.discovery_service_name());
+        let metadata = self.common_metadata(self.resource_names.seed_nodes_service_name());
 
         let service_selector =
             RoleGroupBuilder::cluster_manager_labels(&self.cluster, self.context_names);
@@ -410,13 +394,12 @@ mod tests {
     }
 
     #[test]
-    fn test_build_cluster_manager_service() {
+    fn test_build_seed_nodes_service() {
         let context_names = context_names();
         let role_builder = role_builder(&context_names);
 
-        let cluster_manager_service =
-            serde_json::to_value(role_builder.build_cluster_manager_service())
-                .expect("should be serializable");
+        let cluster_manager_service = serde_json::to_value(role_builder.build_seed_nodes_service())
+            .expect("should be serializable");
 
         assert_eq!(
             json!({
@@ -431,7 +414,7 @@ mod tests {
                         "app.kubernetes.io/version": "3.1.0",
                         "stackable.tech/vendor": "Stackable"
                     },
-                    "name": "my-opensearch-cluster-discovery",
+                    "name": "my-opensearch-cluster-seed-nodes",
                     "namespace": "default",
                     "ownerReferences": [
                         {
@@ -446,10 +429,6 @@ mod tests {
                 "spec": {
                     "clusterIP": "None",
                     "ports": [
-                        {
-                            "name": "http",
-                            "port": 9200
-                        },
                         {
                             "name": "transport",
                             "port": 9300

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

@@ -113,7 +113,7 @@ impl<'a> RoleGroupBuilder<'a> {
         role_group_name: RoleGroupName,
         role_group_config: OpenSearchRoleGroupConfig,
         context_names: &'a ContextNames,
-        discovery_service_name: ServiceName,
+        seed_nodes_service_name: ServiceName,
     ) -> RoleGroupBuilder<'a> {
         RoleGroupBuilder {
             service_account_name,
@@ -122,7 +122,7 @@ impl<'a> RoleGroupBuilder<'a> {
                 cluster.clone(),
                 role_group_name.clone(),
                 role_group_config.clone(),
-                discovery_service_name,
+                seed_nodes_service_name,
             ),
             role_group_name: role_group_name.clone(),
             role_group_config,
@@ -329,7 +329,7 @@ impl<'a> RoleGroupBuilder<'a> {
                 .node_roles
                 .contains(&v1alpha1::NodeRole::ClusterManager)
             {
-                service_scopes.push(self.node_config.discovery_service_name.clone());
+                service_scopes.push(self.node_config.seed_nodes_service_name.clone());
             }
             volumes.push(self.build_tls_volume(
                 &TLS_SERVER_VOLUME_NAME,

rust/operator-binary/src/framework/role_utils.rs

@@ -221,13 +221,13 @@ impl ResourceNames {
             .expect("should be a valid cluster role name")
     }
 
-    pub fn discovery_service_name(&self) -> ServiceName {
-        const SUFFIX: &str = "-discovery";
+    pub fn seed_nodes_service_name(&self) -> ServiceName {
+        const SUFFIX: &str = "-seed-nodes";
 
         // compile-time checks
         const _: () = assert!(
             ClusterName::MAX_LENGTH + SUFFIX.len() <= ServiceName::MAX_LENGTH,
-            "The string `<cluster_name>-discovery` must not exceed the limit of Service names."
+            "The string `<cluster_name>-seed-nodes` must not exceed the limit of Service names."
         );
         let _ = ClusterName::IS_RFC_1035_LABEL_NAME;
         let _ = ClusterName::IS_VALID_LABEL_VALUE;
@@ -414,8 +414,8 @@ mod tests {
             resource_names.cluster_role_name()
         );
         assert_eq!(
-            ServiceName::from_str_unsafe("my-cluster-discovery"),
-            resource_names.discovery_service_name()
+            ServiceName::from_str_unsafe("my-cluster-seed-nodes"),
+            resource_names.seed_nodes_service_name()
         );
     }
 }

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

@@ -115,7 +115,7 @@ spec:
         - name: cluster.initial_cluster_manager_nodes
           value: opensearch-nodes-cluster-manager-0,opensearch-nodes-cluster-manager-1,opensearch-nodes-cluster-manager-2
         - name: discovery.seed_hosts
-          value: opensearch-discovery
+          value: opensearch-seed-nodes
         - name: node.name
           valueFrom:
             fieldRef:
@@ -281,7 +281,7 @@ spec:
                 secrets.stackable.tech/backend.autotls.cert.lifetime: 1d
                 secrets.stackable.tech/class: tls
                 secrets.stackable.tech/format: tls-pem
-                secrets.stackable.tech/scope: service=opensearch-discovery,listener-volume=listener,pod
+                secrets.stackable.tech/scope: service=opensearch-seed-nodes,listener-volume=listener,pod
             spec:
               accessModes:
               - ReadWriteOnce
@@ -447,7 +447,7 @@ spec:
         - name: OPENSEARCH_HOME
           value: {{ test_scenario['values']['opensearch_home'] }}
         - name: discovery.seed_hosts
-          value: opensearch-discovery
+          value: opensearch-seed-nodes
         - name: node.name
           valueFrom:
             fieldRef:
@@ -820,18 +820,14 @@ metadata:
     app.kubernetes.io/name: opensearch
     app.kubernetes.io/version: {{ test_scenario['values']['opensearch'].split(',')[0] }}
     stackable.tech/vendor: Stackable
-  name: opensearch-discovery
+  name: opensearch-seed-nodes
   ownerReferences:
   - apiVersion: opensearch.stackable.tech/v1alpha1
     controller: true
     kind: OpenSearchCluster
     name: opensearch
 spec:
   ports:
-  - name: http
-    port: 9200
-    protocol: TCP
-    targetPort: 9200
   - name: transport
     port: 9300
     protocol: TCP