adapt logging tests

Author: maltesander

…s/templates/kuttl/logging/02-assert.yaml …emplates/kuttl/logging/02-assert.yaml.j2tests/templates/kuttl/logging/02-assert.yaml renamed to tests/templates/kuttl/logging/02-assert.yaml.j2 tests/templates/kuttl/logging/02-assert.yaml renamed to tests/templates/kuttl/logging/02-assert.yaml.j2

@@ -1,3 +1,4 @@
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
@@ -10,3 +11,4 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
+{% endif %}

tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2

@@ -1,3 +1,4 @@
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperCluster
@@ -26,3 +27,4 @@ metadata:
 spec:
   clusterRef:
     name: test-zk
+{% endif %}

tests/templates/kuttl/logging/04-assert.yaml

@@ -0,0 +1,38 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 600
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-automatic-log-config
+status:
+  readyReplicas: 1
+  replicas: 1
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-custom-log-config
+status:
+  readyReplicas: 1
+  replicas: 1
+{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-controller-automatic-log-config
+status:
+  readyReplicas: 1
+  replicas: 1
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-controller-custom-log-config
+status:
+  readyReplicas: 1
+  replicas: 1
+{% endif %}

tests/templates/kuttl/logging/04-assert.yaml.j2

@@ -36,7 +36,54 @@ spec:
     tls:
       serverSecretClass: null
     vectorAggregatorConfigMapName: kafka-vector-aggregator-discovery
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
     zookeeperConfigMapName: test-kafka-znode
+{% else %}
+  controllers:
+    roleGroups:
+      automatic-log-config:
+        replicas: 1
+        config:
+          logging:
+            enableVectorAgent: true
+            containers:
+              kafka:
+                console:
+                  level: INFO
+                file:
+                  level: INFO
+                loggers:
+                  ROOT:
+                    level: INFO
+              vector:
+                console:
+                  level: INFO
+                file:
+                  level: INFO
+                loggers:
+                  ROOT:
+                    level: INFO
+        podOverrides:
+          spec:
+            containers:
+              - name: vector
+                volumeMounts:
+                  - name: prepared-logs
+                    mountPath: /stackable/log/prepared-logs
+            volumes:
+              - name: prepared-logs
+                configMap:
+                  name: prepared-logs
+      custom-log-config:
+        replicas: 1
+        config:
+          logging:
+            enableVectorAgent: true
+            containers:
+              kafka:
+                custom:
+                  configMap: kafka-log-config
+{% endif %}
   brokers:
     roleGroups:
       automatic-log-config:

tests/templates/kuttl/logging/04-install-kafka.yaml.j2

@@ -48,6 +48,32 @@ customConfig:
       condition: >-
         .pod == "test-kafka-broker-custom-log-config-0" &&
         .container == "vector"
+{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+    filteredAutomaticLogConfigControllerKafka:
+      type: filter
+      inputs: [validEvents]
+      condition: >-
+        .pod == "test-kafka-controller-automatic-log-config-0" &&
+        .container == "kafka"
+    filteredAutomaticLogConfigControllerVector:
+      type: filter
+      inputs: [validEvents]
+      condition: >-
+        .pod == "test-kafka-controller-automatic-log-config-0" &&
+        .container == "vector"
+    filteredCustomLogConfigControllerKafka:
+      type: filter
+      inputs: [validEvents]
+      condition: >-
+        .pod == "test-kafka-controller-custom-log-config-0" &&
+        .container == "kafka"
+    filteredCustomLogConfigControllerVector:
+      type: filter
+      inputs: [validEvents]
+      condition: >-
+        .pod == "test-kafka-controller-custom-log-config-0" &&
+        .container == "vector"
+{% endif %}
     filteredInvalidEvents:
       type: filter
       inputs: [vector]

tests/templates/kuttl/logging/kafka-vector-aggregator-values.yaml.j2

@@ -104,6 +104,7 @@ tests:
     dimensions:
       - kafka
       - zookeeper-latest
+      - use-kraft-controller
       - openshift
   - name: cluster-operation
     dimensions: