feat: Rename discovery service

Author: siegfriedweber

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

@@ -105,7 +105,7 @@ mod tests {
         );
         assert_eq!(
             vec![
-                "my-opensearch",
+                "my-opensearch-discovery",
                 "my-opensearch-nodes-cluster-manager-headless",
                 "my-opensearch-nodes-coordinating-headless",
                 "my-opensearch-nodes-data-headless"

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

@@ -427,7 +427,7 @@ mod tests {
                         "app.kubernetes.io/version": "3.1.0",
                         "stackable.tech/vendor": "Stackable"
                     },
-                    "name": "my-opensearch-cluster",
+                    "name": "my-opensearch-cluster-discovery",
                     "namespace": "default",
                     "ownerReferences": [
                         {

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

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

tests/templates/kuttl/backup-restore/22-create-testuser.yaml

@@ -72,7 +72,7 @@ data:
     client = OpenSearch(
       http_auth=('admin', 'AJVFsGJBbpT6mChn'),
       hosts=[{
-        'host': f'opensearch-1-nodes-default.{namespace}.svc.cluster.local',
+        'host': f'opensearch-1-nodes-default-headless.{namespace}.svc.cluster.local',
         'port': 9200
       }],
       http_compress=True,

tests/templates/kuttl/backup-restore/23-create-data.yaml

@@ -72,7 +72,7 @@ data:
     client = OpenSearch(
       http_auth=('testuser', 'L9hUHtLVVEsrcLzZ'),
       hosts=[{
-        'host': f'opensearch-1-nodes-default.{namespace}.svc.cluster.local',
+        'host': f'opensearch-1-nodes-default-headless.{namespace}.svc.cluster.local',
         'port': 9200
       }],
       http_compress=True,

tests/templates/kuttl/backup-restore/30-create-snapshot.yaml

@@ -70,7 +70,7 @@ data:
 
     client = OpenSearch(
       hosts=[{
-        'host': f'opensearch-1-nodes-default.{namespace}.svc.cluster.local',
+        'host': f'opensearch-1-nodes-default-headless.{namespace}.svc.cluster.local',
         'port': 9200
       }],
       http_auth=('admin', 'AJVFsGJBbpT6mChn'),

tests/templates/kuttl/backup-restore/61-restore-snapshot.yaml

@@ -70,7 +70,7 @@ data:
 
     client = OpenSearch(
       hosts=[{
-        'host': f'opensearch-2-nodes-default.{namespace}.svc.cluster.local',
+        'host': f'opensearch-2-nodes-default-headless.{namespace}.svc.cluster.local',
         'port': 9200
       }],
       http_auth=('admin', 'AJVFsGJBbpT6mChn'),

tests/templates/kuttl/backup-restore/70-test-opensearch-2.yaml

@@ -72,7 +72,7 @@ data:
     client = OpenSearch(
       http_auth=('testuser', 'L9hUHtLVVEsrcLzZ'),
       hosts=[{
-        'host': f'opensearch-2-nodes-default.{namespace}.svc.cluster.local',
+        'host': f'opensearch-2-nodes-default-headless.{namespace}.svc.cluster.local',
         'port': 9200
       }],
       http_compress=True,

tests/templates/kuttl/external-access/20-assert.yaml

@@ -57,6 +57,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: opensearch
+  name: opensearch-discovery
 spec:
   type: ClusterIP

tests/templates/kuttl/ldap/30-test-opensearch.yaml

@@ -77,7 +77,7 @@ data:
 
     namespace = os.environ['NAMESPACE']
 
-    host = f'opensearch.{namespace}.svc.cluster.local'
+    host = f'opensearch-nodes-default-headless.{namespace}.svc.cluster.local'
     port = 9200
     auth = ('integrationtest', 'integrationtest')
     ca_certs_path = '/stackable/tls/ca.crt'