test: Use the discovery ConfigMap in all tests

siegfriedweber · siegfriedweber · commit a99b79ea024d · 2026-01-08T15:48:27.000Z
diff --git a/tests/templates/kuttl/backup-restore/22-create-testuser.yaml b/tests/templates/kuttl/backup-restore/22-create-testuser.yaml
@@ -22,10 +22,9 @@ spec:
             # required for pip install
             - name: HOME
               value: /stackable
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-1
           volumeMounts:
             - name: script
               mountPath: /stackable/scripts
@@ -66,17 +65,16 @@ data:
     from opensearchpy import OpenSearch
     from opensearchpy.exceptions import RequestError
 
-    namespace = os.environ['NAMESPACE']
+    host = os.environ['OPENSEARCH_HOST']
+    port = os.environ['OPENSEARCH_PORT']
+    http_use_tls = os.environ['OPENSEARCH_PROTOCOL'] == 'https'
 
     # Login as admin
     client = OpenSearch(
+      hosts = [{'host': host, 'port': port}],
       http_auth=('admin', 'AJVFsGJBbpT6mChn'),
-      hosts=[{
-        'host': f'opensearch-1-nodes-default-headless.{namespace}.svc.cluster.local',
-        'port': 9200
-      }],
       http_compress=True,
-      use_ssl=True,
+      use_ssl=http_use_tls,
       verify_certs=True,
       ca_certs='/stackable/tls/ca.crt'
     )
diff --git a/tests/templates/kuttl/backup-restore/23-create-data.yaml b/tests/templates/kuttl/backup-restore/23-create-data.yaml
@@ -22,10 +22,9 @@ spec:
             # required for pip install
             - name: HOME
               value: /stackable
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-1
           volumeMounts:
             - name: script
               mountPath: /stackable/scripts
@@ -66,17 +65,16 @@ data:
     from opensearchpy import OpenSearch
     from opensearchpy.exceptions import RequestError
 
-    namespace = os.environ['NAMESPACE']
+    host = os.environ['OPENSEARCH_HOST']
+    port = os.environ['OPENSEARCH_PORT']
+    http_use_tls = os.environ['OPENSEARCH_PROTOCOL'] == 'https'
 
     # Login as test user
     client = OpenSearch(
+      hosts = [{'host': host, 'port': port}],
       http_auth=('testuser', 'L9hUHtLVVEsrcLzZ'),
-      hosts=[{
-        'host': f'opensearch-1-nodes-default-headless.{namespace}.svc.cluster.local',
-        'port': 9200
-      }],
       http_compress=True,
-      use_ssl=True,
+      use_ssl=http_use_tls,
       verify_certs=True,
       ca_certs='/stackable/tls/ca.crt'
     )
diff --git a/tests/templates/kuttl/backup-restore/30-create-snapshot.yaml b/tests/templates/kuttl/backup-restore/30-create-snapshot.yaml
@@ -22,10 +22,9 @@ spec:
             # required for pip install
             - name: HOME
               value: /stackable
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-1
           volumeMounts:
             - name: script
               mountPath: /stackable/scripts
@@ -66,16 +65,15 @@ data:
     from opensearchpy import OpenSearch
     from opensearchpy.exceptions import RequestError
 
-    namespace = os.environ['NAMESPACE']
+    host = os.environ['OPENSEARCH_HOST']
+    port = os.environ['OPENSEARCH_PORT']
+    http_use_tls = os.environ['OPENSEARCH_PROTOCOL'] == 'https'
 
     client = OpenSearch(
-      hosts=[{
-        'host': f'opensearch-1-nodes-default-headless.{namespace}.svc.cluster.local',
-        'port': 9200
-      }],
+      hosts = [{'host': host, 'port': port}],
       http_auth=('admin', 'AJVFsGJBbpT6mChn'),
       http_compress=True,
-      use_ssl=True,
+      use_ssl=http_use_tls,
       verify_certs=True,
       ca_certs='/stackable/tls/ca.crt'
     )
diff --git a/tests/templates/kuttl/backup-restore/31-backup-security-indices.yaml.j2 b/tests/templates/kuttl/backup-restore/31-backup-security-indices.yaml.j2
@@ -11,11 +11,9 @@ spec:
           image: oci.stackable.tech/sdp/opensearch:{{ test_scenario['values']['opensearch'].split(',')[0] }}-stackable{{ test_scenario['values']['release'] }}
           command:
             - /stackable/scripts/backup-security-indices.sh
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-1
           volumeMounts:
             - name: scripts
               mountPath: /stackable/scripts
@@ -116,7 +114,7 @@ data:
         -cacert config/tls/ca.crt \
         -cert config/tls-client/tls.crt \
         -key config/tls-client/tls.key \
-        --hostname opensearch-1-nodes-default-headless.$NAMESPACE.svc.cluster.local \
+        --hostname $OPENSEARCH_HOST \
         -backup /tmp/backup
   upload-security-indices-backup.sh: |
     #!/usr/bin/env sh
diff --git a/tests/templates/kuttl/backup-restore/60-restore-security-indices.yaml.j2 b/tests/templates/kuttl/backup-restore/60-restore-security-indices.yaml.j2
@@ -48,11 +48,9 @@ spec:
           image: oci.stackable.tech/sdp/opensearch:{{ test_scenario['values']['opensearch'].split(',')[0] }}-stackable{{ test_scenario['values']['release'] }}
           command:
             - /stackable/scripts/restore-security-indices.sh
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-2
           volumeMounts:
             - name: scripts
               mountPath: /stackable/scripts
@@ -121,5 +119,5 @@ data:
         -cacert config/tls/ca.crt \
         -cert config/tls-client/tls.crt \
         -key config/tls-client/tls.key \
-        --hostname opensearch-2-nodes-default-headless.$NAMESPACE.svc.cluster.local \
+        --hostname $OPENSEARCH_HOST \
         --configdir /tmp/backup
diff --git a/tests/templates/kuttl/backup-restore/61-restore-snapshot.yaml b/tests/templates/kuttl/backup-restore/61-restore-snapshot.yaml
@@ -22,10 +22,9 @@ spec:
             # required for pip install
             - name: HOME
               value: /stackable
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-2
           volumeMounts:
             - name: script
               mountPath: /stackable/scripts
@@ -66,16 +65,15 @@ data:
     from opensearchpy import OpenSearch
     from opensearchpy.exceptions import RequestError
 
-    namespace = os.environ['NAMESPACE']
+    host = os.environ['OPENSEARCH_HOST']
+    port = os.environ['OPENSEARCH_PORT']
+    http_use_tls = os.environ['OPENSEARCH_PROTOCOL'] == 'https'
 
     client = OpenSearch(
-      hosts=[{
-        'host': f'opensearch-2-nodes-default-headless.{namespace}.svc.cluster.local',
-        'port': 9200
-      }],
+      hosts = [{'host': host, 'port': port}],
       http_auth=('admin', 'AJVFsGJBbpT6mChn'),
       http_compress=True,
-      use_ssl=True,
+      use_ssl=http_use_tls,
       verify_certs=True,
       ca_certs='/stackable/tls/ca.crt'
     )
diff --git a/tests/templates/kuttl/backup-restore/70-test-opensearch-2.yaml b/tests/templates/kuttl/backup-restore/70-test-opensearch-2.yaml
@@ -22,10 +22,9 @@ spec:
             # required for pip install
             - name: HOME
               value: /stackable
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch-2
           volumeMounts:
             - name: script
               mountPath: /stackable/scripts
@@ -66,17 +65,16 @@ data:
     from opensearchpy import OpenSearch
     from opensearchpy.exceptions import RequestError
 
-    namespace = os.environ['NAMESPACE']
+    host = os.environ['OPENSEARCH_HOST']
+    port = os.environ['OPENSEARCH_PORT']
+    http_use_tls = os.environ['OPENSEARCH_PROTOCOL'] == 'https'
 
     # Login as test user
     client = OpenSearch(
+      hosts = [{'host': host, 'port': port}],
       http_auth=('testuser', 'L9hUHtLVVEsrcLzZ'),
-      hosts=[{
-        'host': f'opensearch-2-nodes-default-headless.{namespace}.svc.cluster.local',
-        'port': 9200
-      }],
       http_compress=True,
-      use_ssl=True,
+      use_ssl=http_use_tls,
       verify_certs=True,
       ca_certs='/stackable/tls/ca.crt'
     )
diff --git a/tests/templates/kuttl/external-access/20-assert.yaml b/tests/templates/kuttl/external-access/20-assert.yaml
@@ -57,6 +57,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: opensearch-discovery
+  name: opensearch
 spec:
-  type: ClusterIP
+  type: NodePort # external-stable
diff --git a/tests/templates/kuttl/external-access/opensearch.yaml.j2 b/tests/templates/kuttl/external-access/opensearch.yaml.j2
@@ -18,6 +18,8 @@ spec:
     config:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleConfig:
+      discoveryServiceListenerClass: test-external-stable-$NAMESPACE
     roleGroups:
       cluster-manager:
         config:
diff --git a/tests/templates/kuttl/ldap/30-test-opensearch.yaml b/tests/templates/kuttl/ldap/30-test-opensearch.yaml
@@ -22,10 +22,9 @@ spec:
             # required for pip install
             - name: HOME
               value: /stackable
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+          envFrom:
+            - configMapRef:
+                name: opensearch
           volumeMounts:
             - name: script
               mountPath: /stackable/scripts
@@ -75,20 +74,17 @@ data:
     import os
     from opensearchpy import OpenSearch
 
-    namespace = os.environ['NAMESPACE']
-
-    host = f'opensearch-nodes-default-headless.{namespace}.svc.cluster.local'
-    port = 9200
-    auth = ('integrationtest', 'integrationtest')
-    ca_certs_path = '/stackable/tls/ca.crt'
+    host = os.environ['OPENSEARCH_HOST']
+    port = os.environ['OPENSEARCH_PORT']
+    http_use_tls = os.environ['OPENSEARCH_PROTOCOL'] == 'https'
 
     client = OpenSearch(
-        hosts = [{'host': host, 'port': port}],
-        http_compress = True,
-        http_auth = auth,
-        use_ssl = True,
-        verify_certs = True,
-        ca_certs = ca_certs_path
+      hosts = [{'host': host, 'port': port}],
+      http_auth=('integrationtest', 'integrationtest'),
+      http_compress=True,
+      use_ssl=http_use_tls,
+      verify_certs=True,
+      ca_certs='/stackable/tls/ca.crt'
     )
 
     # Create an index
diff --git a/tests/templates/kuttl/smoke/10-assert.yaml.j2 b/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-seed-nodes
+          # value: opensearch-seed-nodes.$NAMESPACE.svc.cluster.local
         - name: node.name
           valueFrom:
             fieldRef:
@@ -267,7 +267,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: listener-volume=listener,pod
+                secrets.stackable.tech/scope: service=opensearch-seed-nodes,listener-volume=listener,pod
             spec:
               accessModes:
               - ReadWriteOnce
@@ -285,7 +285,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-seed-nodes,listener-volume=listener,listener-volume=discovery-service-listener,pod
+                secrets.stackable.tech/scope: listener-volume=listener,listener-volume=discovery-service-listener,pod
             spec:
               accessModes:
               - ReadWriteOnce
@@ -475,7 +475,7 @@ spec:
         - name: OPENSEARCH_HOME
           value: {{ test_scenario['values']['opensearch_home'] }}
         - name: discovery.seed_hosts
-          value: opensearch-seed-nodes
+          # value: opensearch-seed-nodes.$NAMESPACE.svc.cluster.local
         - name: node.name
           valueFrom:
             fieldRef:
