fix merge conflict

Author: adwk67

CHANGELOG.md

@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - BREAKING: The `.clusterConfig.metadataStorageDatabase` field has been renamed to `.clusterConfig.metadataDatabase` for consistency ([#814]).
 - Document Helm deployed RBAC permissions and remove unnecessary permissions ([#810]).
 - Internal operator refactoring: introduce dereference() and validate() steps in the reconciler ([#824]).
+- test: Bump vector-aggregator to 0.55.0, replace /graphql call with gRPC calls ([#826]).
 
 ### Deleted
 
@@ -27,6 +28,7 @@ All notable changes to this project will be documented in this file.
 [#814]: https://github.com/stackabletech/druid-operator/pull/814
 [#818]: https://github.com/stackabletech/druid-operator/pull/818
 [#824]: https://github.com/stackabletech/druid-operator/pull/824
+[#826]: https://github.com/stackabletech/druid-operator/pull/826
 
 ## [26.3.0] - 2026-03-16
 

tests/templates/kuttl/authorizer/02-install-opa.yaml.j2

@@ -29,11 +29,11 @@ metadata:
   name: test-opa
 spec:
   image:
-{% if test_scenario['values']['opa'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['opa'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['opa'].split(',')[0] }}"
+{% if test_scenario['values']['opa-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['opa-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['opa-latest'].split(',')[0] }}"
 {% else %}
-    productVersion: "{{ test_scenario['values']['opa'] }}"
+    productVersion: "{{ test_scenario['values']['opa-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}

tests/templates/kuttl/logging/01-install-druid-vector-aggregator.yaml

@@ -5,7 +5,7 @@ commands:
   - script: >-
       helm install druid-vector-aggregator vector
       --namespace $NAMESPACE
-      --version 0.49.0
+      --version 0.52.0 `# app version 0.55.0`
       --repo https://helm.vector.dev
       --values 01_druid-vector-aggregator-values.yaml
 ---

tests/templates/kuttl/logging/test_log_aggregation.py

@@ -1,45 +1,40 @@
-#!/usr/bin/env python3
-import requests
+import json
+import subprocess
 
 
 def check_sent_events():
-    response = requests.post(
-        "http://druid-vector-aggregator:8686/graphql",
-        json={
-            "query": """
-                {
-                    transforms(first:100) {
-                        nodes {
-                            componentId
-                            metrics {
-                                sentEventsTotal {
-                                    sentEventsTotal
-                                }
-                            }
-                        }
-                    }
-                }
-            """
-        },
+    response = subprocess.run(
+        [
+            "grpcurl",
+            "-plaintext",
+            "-d",
+            '{"limit": 100}',
+            "druid-vector-aggregator:8686",
+            "vector.observability.v1.ObservabilityService/GetComponents",
+        ],
+        capture_output=True,
+        text=True,
+        check=True,  # Raise a CalledProcessError if non-zero return
+        timeout=20,  # seconds
     )
+    result = json.loads(response.stdout)
+    components = result.get("components", [])
+    transforms = [
+        c for c in components if c.get("componentType") == "COMPONENT_TYPE_TRANSFORM"
+    ]
 
-    assert response.status_code == 200, (
-        "Cannot access the API of the vector aggregator."
-    )
-
-    result = response.json()
+    assert len(transforms) > 0, "No transform components found"
 
-    transforms = result["data"]["transforms"]["nodes"]
     for transform in transforms:
         sentEvents = transform["metrics"]["sentEventsTotal"]
         componentId = transform["componentId"]
 
         if componentId == "filteredInvalidEvents":
-            assert sentEvents is None or sentEvents["sentEventsTotal"] == 0, (
+            assert sentEvents is None or int(sentEvents) == 0, (
                 "Invalid log events were sent."
             )
         else:
-            assert sentEvents is not None and sentEvents["sentEventsTotal"] > 0, (
+            assert sentEvents is not None and int(sentEvents) > 0, (
                 f'No events were sent in "{componentId}".'
             )
 

tests/test-definition.yaml

@@ -29,9 +29,9 @@ dimensions:
   - name: zookeeper-latest
     values:
       - 3.9.4
-  - name: opa
+  - name: opa-latest
     values:
-      - 1.12.3
+      - 1.16.2
   - name: hadoop
     values:
       - 3.4.2
@@ -73,7 +73,7 @@ tests:
     dimensions:
       - druid
       - zookeeper-latest
-      - opa
+      - opa-latest
       - hadoop
       - openshift
   - name: ingestion-no-s3-ext
@@ -121,7 +121,7 @@ tests:
     dimensions:
       - druid
       - zookeeper-latest
-      - opa
+      - opa-latest
       - hadoop-latest
       - ldap-use-tls
       - ldap-no-bind-credentials