address feedback on PR

Author: labrenbe

tests/templates/kuttl/opensearch-dashboards/10-assert.yaml.j2

@@ -9,15 +9,7 @@ timeout: 600
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: opensearch-nodes-cluster-manager
-status:
-  readyReplicas: 1
-  replicas: 1
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: opensearch-nodes-data
+  name: opensearch-nodes-default
 status:
   readyReplicas: 1
   replicas: 1

tests/templates/kuttl/opensearch-dashboards/10-install-opensearch.yaml.j2

@@ -21,35 +21,8 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
-      cluster-manager:
+      default:
         config:
-          nodeRoles:
-            - cluster_manager
-          resources:
-            storage:
-              data:
-                capacity: 100Mi
-          listenerClass: external-stable
-        replicas: 1
-        podOverrides:
-          spec:
-            volumes:
-              - name: tls
-                ephemeral:
-                  volumeClaimTemplate:
-                    metadata:
-                      annotations:
-                        secrets.stackable.tech/scope: node,pod,service=opensearch,service=opensearch-nodes-cluster-manager-headless
-      data:
-        config:
-          nodeRoles:
-            - ingest
-            - data
-            - remote_cluster_client
-          resources:
-            storage:
-              data:
-                capacity: 2Gi
           listenerClass: cluster-internal
         replicas: 1
         podOverrides:
@@ -60,7 +33,7 @@ spec:
                   volumeClaimTemplate:
                     metadata:
                       annotations:
-                        secrets.stackable.tech/scope: node,pod,service=opensearch-nodes-data-headless
+                        secrets.stackable.tech/scope: node,pod,service=opensearch,service=opensearch-nodes-cluster-manager-headless
     envOverrides:
       # Only required for the official image
       # The official image (built with https://github.com/opensearch-project/opensearch-build)

tests/templates/kuttl/opensearch-dashboards/20-install-opensearch-dashboards.yaml.j2

@@ -8,6 +8,6 @@ commands:
       --version "{{ test_scenario['values']['opensearch'].split(',')[0] }}"
       --values 20_opensearch-dashboards-values.yaml
       --set opensearchHosts=https://opensearch.$NAMESPACE.svc.cluster.local:9200
-      --namespace  $NAMESPACE
+      --namespace $NAMESPACE
       --wait
     timeout: 600

tests/templates/kuttl/opensearch-dashboards/30-assert.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 600
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: test-opensearch-dashboards
+status:
+  succeeded: 1

tests/templates/kuttl/opensearch-dashboards/30-create-configmap.yaml.j2

@@ -0,0 +1,60 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: kubectl create cm test-opensearch-dashboards -n $NAMESPACE --from-file=test.py
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: test-opensearch-dashboards
+spec:
+  template:
+    spec:
+      containers:
+        - name: test-opensearch-dashboards
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
+          command:
+            - /bin/bash
+            - -euxo
+            - pipefail
+            - -c
+          args:
+            - |
+              sleep 60
+              python scripts/test.py
+          env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: OPENSEARCH_USER
+              value: admin
+            - name: OPENSEARCH_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: opensearch-credentials
+                  key: admin
+          volumeMounts:
+            - name: script
+              mountPath: /stackable/scripts
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            runAsNonRoot: true
+          resources:
+            requests:
+              memory: 128Mi
+              cpu: 100m
+            limits:
+              memory: 128Mi
+              cpu: 400m
+      volumes:
+        - name: script
+          configMap:
+            name: test-opensearch-dashboards
+      serviceAccountName: test-service-account
+      securityContext:
+        fsGroup: 1000
+      restartPolicy: OnFailure

tests/templates/kuttl/opensearch-dashboards/30-test-opensearch-dashboards.yaml.j2

@@ -2,13 +2,9 @@
 import os
 import requests
 import sys
-import urllib3
-
-# disable tls insecure warnings
-urllib3.disable_warnings()
 
 logging.basicConfig(
-    level="INFO", format="%(asctime)s %(levelname)s: %(message)s", stream=sys.stdout
+    level="DEBUG", format="%(asctime)s %(levelname)s: %(message)s", stream=sys.stdout
 )
 
 namespace = os.environ["NAMESPACE"]